From 6174bb08c525b11fb089f4b010197e452ad06719 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Tue, 25 Aug 2015 02:43:19 +0300 Subject: [PATCH] Bump Rails to 4.2.4 --- Gemfile | 2 +- Gemfile.lock | 94 ++++++++++++++++++++++++---------------------------- 2 files changed, 45 insertions(+), 51 deletions(-) diff --git a/Gemfile b/Gemfile index fb93bc3..6a2a744 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rails', '4.2.3' +gem 'rails', '4.2.4' gem 'sqlite3' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 3754a51..d1ead66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,43 +14,43 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) + actionmailer (4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.3) - actionview (= 4.2.3) - activesupport (= 4.2.3) + actionpack (4.2.4) + actionview (= 4.2.4) + activesupport (= 4.2.4) 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.3) - activesupport (= 4.2.3) + actionview (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.3) - activesupport (= 4.2.3) + activejob (4.2.4) + activesupport (= 4.2.4) globalid (>= 0.3.0) - activemodel (4.2.3) - activesupport (= 4.2.3) + activemodel (4.2.4) + activesupport (= 4.2.4) builder (~> 3.1) - activerecord (4.2.3) - activemodel (= 4.2.3) - activesupport (= 4.2.3) + activerecord (4.2.4) + activemodel (= 4.2.4) + activesupport (= 4.2.4) arel (~> 6.0) - activesupport (4.2.3) + activesupport (4.2.4) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) arel (6.0.3) - autoprefixer-rails (5.2.1.1) + autoprefixer-rails (5.2.1.2) execjs json awesome_print (1.6.1) @@ -76,7 +76,7 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-puma (1.1.0) + capistrano3-puma (1.2.1) capistrano (~> 3.0) puma (>= 2.6) capybara (2.4.4) @@ -102,10 +102,6 @@ GEM colorize (0.7.7) copy_carrierwave_file (1.1.0) carrierwave (~> 0.9) - countries (0.11.5) - currencies (~> 0.4.2) - i18n_data (~> 0.7.0) - currencies (0.4.2) devise (3.5.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -121,17 +117,17 @@ GEM thread thread_safe erubis (2.7.0) - execjs (2.5.2) + execjs (2.6.0) factory_girl (4.5.0) activesupport (>= 3.0.0) factory_girl_rails (4.5.0) factory_girl (~> 4.5.0) railties (>= 3.0.0) - faker (1.4.3) + faker (1.5.0) i18n (~> 0.5) ffi (1.9.10) - font-awesome-sass (4.3.2.1) - sass (~> 3.2) + font-awesome-sass (4.4.0) + sass (>= 3.2) formatador (0.2.5) globalid (0.3.6) activesupport (>= 4.1.0) @@ -163,7 +159,6 @@ GEM i18n term-ansicolor (>= 1.3.2) terminal-table (>= 1.5.1) - i18n_data (0.7.0) jquery-datatables-rails (3.3.0) actionpack (>= 3.1) jquery-rails @@ -178,7 +173,7 @@ GEM listen (3.0.3) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) lumberjack (1.0.9) mail (2.6.3) @@ -201,10 +196,9 @@ GEM shellany (~> 0.0) orm_adapter (0.5.0) pg (0.18.2) - phony (2.14.13) - phony_rails (0.12.9) + phony (2.14.14) + phony_rails (0.12.10) activesupport (>= 3.0) - countries (~> 0.11, >= 0.11.5) phony (~> 2.12) pry (0.10.1) coderay (~> 1.1.0) @@ -212,26 +206,26 @@ GEM slop (~> 3.4) pry-rails (0.3.4) pry (>= 0.9.10) - puma (2.12.3) + puma (2.13.4) quiet_assets (1.1.0) railties (>= 3.1, < 5.0) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.3) - actionmailer (= 4.2.3) - actionpack (= 4.2.3) - actionview (= 4.2.3) - activejob (= 4.2.3) - activemodel (= 4.2.3) - activerecord (= 4.2.3) - activesupport (= 4.2.3) + rails (4.2.4) + actionmailer (= 4.2.4) + actionpack (= 4.2.4) + actionview (= 4.2.4) + activejob (= 4.2.4) + activemodel (= 4.2.4) + activerecord (= 4.2.4) + activesupport (= 4.2.4) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.3) + railties (= 4.2.4) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) @@ -245,9 +239,9 @@ GEM rails-i18n (4.0.4) i18n (~> 0.6) railties (~> 4.0) - railties (4.2.3) - actionpack (= 4.2.3) - activesupport (= 4.2.3) + railties (4.2.4) + actionpack (= 4.2.4) + activesupport (= 4.2.4) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -280,7 +274,7 @@ GEM rspec-support (~> 3.3.0) rspec-support (3.3.0) ruby-graphviz (1.2.2) - sass (3.4.16) + sass (3.4.17) sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -309,7 +303,7 @@ GEM spring (1.3.6) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (3.2.0) + sprockets (3.3.3) rack (~> 1.0) sprockets-rails (2.3.2) actionpack (>= 3.0) @@ -331,7 +325,7 @@ GEM thread (0.2.2) thread_safe (0.3.5) tilt (1.4.1) - tins (1.5.4) + tins (1.6.0) tzinfo (1.2.2) thread_safe (~> 0.1) uglifier (2.7.1) @@ -377,7 +371,7 @@ DEPENDENCIES pry-rails puma quiet_assets - rails (= 4.2.3) + rails (= 4.2.4) rails-erd rails-i18n raphael-rails