From 285ab9f9d56ab232a390214f3fc9b29848e63ef5 Mon Sep 17 00:00:00 2001 From: Angel Perez Date: Tue, 14 Nov 2017 09:48:52 -0400 Subject: [PATCH] Update Rails to version 4.2.10 --- Gemfile | 11 ++++---- Gemfile.lock | 80 +++++++++++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 43 deletions(-) diff --git a/Gemfile b/Gemfile index 409f763e9..b0c7f2e9a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.9' +gem 'rails', '4.2.10' gem 'acts-as-taggable-on', '~> 4.0.0' gem 'acts_as_votable', '~> 0.10.0' @@ -37,7 +37,6 @@ gem 'paperclip', '~> 5.1.0' gem 'paranoia', '~> 2.3.1' gem 'pg', '~> 0.21.0' gem 'pg_search', '~> 2.0.1' -gem 'rails-assets-markdown-it', '~> 8.2.1', source: 'https://rails-assets.org' gem 'redcarpet', '~> 3.4.0' gem 'responders', '~> 2.4.0' gem 'rinku', '~> 2.0.2', require: 'rails_rinku' @@ -53,15 +52,17 @@ gem 'turnout', '~> 2.4.0' gem 'uglifier', '~> 3.2.0' gem 'unicorn', '~> 5.3.0' gem 'whenever', '~> 0.9.7', require: false + source 'https://rails-assets.org' do gem 'rails-assets-leaflet' + gem 'rails-assets-markdown-it', '~> 8.2.1' end group :development, :test do - gem "bullet", '~> 5.5.1' + gem 'bullet', '~> 5.5.1' gem 'byebug', '~> 9.1.0' gem 'factory_girl_rails', '~> 4.8.0' - gem "faker", '~> 1.7.3' + gem 'faker', '~> 1.7.3' gem 'i18n-tasks', '~> 0.9.15' gem 'knapsack', '~> 1.13.3' gem 'launchy', '~> 2.4.3' @@ -83,7 +84,7 @@ end group :development do gem 'capistrano', '~> 3.8.1', require: false gem 'capistrano-bundler', '~> 1.2', require: false - gem "capistrano-rails", '~> 1.2.3', require: false + gem 'capistrano-rails', '~> 1.2.3', require: false gem 'capistrano3-delayed-job', '~> 1.7.3' gem 'mdl', '~> 0.4.0', require: false gem 'rubocop', '~> 0.49.1', require: false diff --git a/Gemfile.lock b/Gemfile.lock index b3bdaed90..8bfbbb27c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,36 +2,36 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) + actionmailer (4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.9) - actionview (= 4.2.9) - activesupport (= 4.2.9) + actionpack (4.2.10) + actionview (= 4.2.10) + activesupport (= 4.2.10) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.9) - activesupport (= 4.2.9) + actionview (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.9) - activesupport (= 4.2.9) + activejob (4.2.10) + activesupport (= 4.2.10) globalid (>= 0.3.0) - activemodel (4.2.9) - activesupport (= 4.2.9) + activemodel (4.2.10) + activesupport (= 4.2.10) builder (~> 3.1) - activerecord (4.2.9) - activemodel (= 4.2.9) - activesupport (= 4.2.9) + activerecord (4.2.10) + activemodel (= 4.2.10) + activesupport (= 4.2.10) arel (~> 6.0) - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -117,6 +117,7 @@ GEM term-ansicolor (~> 1.3) thor (~> 0.19.4) tins (~> 1.6) + crass (1.0.3) daemons (1.2.4) dalli (2.7.6) database_cleaner (1.6.1) @@ -172,7 +173,7 @@ GEM railties (>= 4.1) tzinfo (~> 1.2, >= 1.2.2) geocoder (1.4.4) - globalid (0.4.0) + globalid (0.4.1) activesupport (>= 4.2.0) graphiql-rails (1.4.2) rails @@ -187,7 +188,8 @@ GEM httpi (2.4.2) rack socksify - i18n (0.8.6) + i18n (0.9.1) + concurrent-ruby (~> 1.0) i18n-tasks (0.9.18) activesupport (>= 4.0.2) ast (>= 2.1.0) @@ -239,10 +241,11 @@ GEM actionmailer (>= 3.2) letter_opener (~> 1.0) railties (>= 3.2) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.6) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) mdl (0.4.0) kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 1.7, >= 1.7.0) @@ -251,6 +254,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.2) + mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.10.3) mixlib-cli (1.7.0) @@ -323,16 +327,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.9) - actionmailer (= 4.2.9) - actionpack (= 4.2.9) - actionview (= 4.2.9) - activejob (= 4.2.9) - activemodel (= 4.2.9) - activerecord (= 4.2.9) - activesupport (= 4.2.9) + rails (4.2.10) + actionmailer (= 4.2.10) + actionpack (= 4.2.10) + actionview (= 4.2.10) + activejob (= 4.2.10) + activemodel (= 4.2.10) + activerecord (= 4.2.10) + activesupport (= 4.2.10) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.9) + railties (= 4.2.10) sprockets-rails rails-assets-leaflet (1.1.0) rails-assets-markdown-it (8.2.2) @@ -344,15 +348,15 @@ GEM rails-deprecated_sanitizer (>= 1.0.1) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.9) - actionpack (= 4.2.9) - activesupport (= 4.2.9) + railties (4.2.10) + actionpack (= 4.2.10) + activesupport (= 4.2.10) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.0.0) + rake (12.2.1) redcarpet (3.4.0) referer-parser (0.3.0) request_store (1.3.2) @@ -456,7 +460,7 @@ GEM rack (>= 1.3, < 3) rack-accept (~> 0.4) tilt (>= 1.4, < 3) - tzinfo (1.2.3) + tzinfo (1.2.4) thread_safe (~> 0.1) uglifier (3.2.0) execjs (>= 0.3.0, < 3) @@ -542,7 +546,7 @@ DEPENDENCIES pg_search (~> 2.0.1) poltergeist (~> 1.15.0) quiet_assets (~> 1.1.0) - rails (= 4.2.9) + rails (= 4.2.10) rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! redcarpet (~> 3.4.0) @@ -569,4 +573,4 @@ DEPENDENCIES whenever (~> 0.9.7) BUNDLED WITH - 1.15.3 + 1.15.4