diff --git a/Gemfile b/Gemfile index d733084efd65bff165c70f698fc63eb06d2adea2..0ca4d0a588425b2aba242796c89ff86aa465d26b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://rails-assets.org' -gem 'rails', '4.1.5' +gem 'rails', '4.1.6' # Legacy Rails features, remove me! diff --git a/Gemfile.lock b/Gemfile.lock index 27fb15667b68c43aa769987f7ff84813bb8effcd..c80415fd3f39231db4eb2c9aa8702ca49637e1ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,29 +2,29 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - mail (~> 2.5.4) - actionpack (4.1.5) - actionview (= 4.1.5) - activesupport (= 4.1.5) + actionmailer (4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + mail (~> 2.5, >= 2.5.4) + actionpack (4.1.6) + actionview (= 4.1.6) + activesupport (= 4.1.6) rack (~> 1.5.2) rack-test (~> 0.6.2) actionpack-action_caching (1.1.1) actionpack (>= 4.0.0, < 5.0) actionpack-page_caching (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.1.5) - activesupport (= 4.1.5) + actionview (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.5) - activesupport (= 4.1.5) + activemodel (4.1.6) + activesupport (= 4.1.6) builder (~> 3.1) - activerecord (4.1.5) - activemodel (= 4.1.5) - activesupport (= 4.1.5) + activerecord (4.1.6) + activemodel (= 4.1.6) + activesupport (= 4.1.6) arel (~> 5.0.0) activerecord-import (0.5.0) activerecord (>= 3.0) @@ -32,7 +32,7 @@ GEM activemodel (~> 4.0) activesupport (~> 4.0) rails-observers (~> 0.1.1) - activesupport (4.1.5) + activesupport (4.1.6) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -254,9 +254,8 @@ GEM lumberjack (1.0.9) macaddr (1.7.1) systemu (~> 2.6.2) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) + mail (2.6.1) + mime-types (>= 1.16, < 3) markerb (1.0.2) redcarpet (>= 2.0) messagebus_ruby_api (1.0.3) @@ -312,7 +311,6 @@ GEM nokogiri orm_adapter (0.5.0) phantomjs (1.9.7.1) - polyglot (0.3.5) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -335,15 +333,15 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (4.1.5) - actionmailer (= 4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - activemodel (= 4.1.5) - activerecord (= 4.1.5) - activesupport (= 4.1.5) + rails (4.1.6) + actionmailer (= 4.1.6) + actionpack (= 4.1.6) + actionview (= 4.1.6) + activemodel (= 4.1.6) + activerecord (= 4.1.6) + activesupport (= 4.1.6) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.5) + railties (= 4.1.6) sprockets-rails (~> 2.0) rails-assets-jquery (1.11.1) rails-assets-perfect-scrollbar (0.4.11) @@ -372,9 +370,9 @@ GEM sass-rails (~> 4.0) rails_autolink (1.1.6) rails (> 3.1) - railties (4.1.5) - actionpack (= 4.1.5) - activesupport (= 4.1.5) + railties (4.1.6) + actionpack (= 4.1.6) + activesupport (= 4.1.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) @@ -464,9 +462,6 @@ GEM timecop (0.7.1) timers (4.0.0) hitimes - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) twitter (4.8.1) faraday (~> 0.8, < 0.10) multi_json (~> 1.0) @@ -560,7 +555,7 @@ DEPENDENCIES rack-protection (= 1.2) rack-rewrite (= 1.5.0) rack-ssl (= 1.4.1) - rails (= 4.1.5) + rails (= 4.1.6) rails-assets-jquery (= 1.11.1) rails-assets-perfect-scrollbar (= 0.4.11) rails-i18n (= 4.0.3)