diff --git a/Gemfile b/Gemfile index 73ea60028df..d8fdf8b6989 100644 --- a/Gemfile +++ b/Gemfile @@ -28,7 +28,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2.5' +gem 'rails', '~> 4.2.7', '>= 4.2.7.1' gem 'actionpack-action_caching' gem 'actionpack-xml_parser' gem 'activerecord-session_store' diff --git a/Gemfile.lock b/Gemfile.lock index 459787c65bf..52c66521bf2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,15 +106,15 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) + actionmailer (4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7) - actionview (= 4.2.7) - activesupport (= 4.2.7) + actionpack (4.2.7.1) + actionview (= 4.2.7.1) + activesupport (= 4.2.7.1) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) @@ -123,21 +123,21 @@ GEM actionpack (>= 4.0.0, < 5.0) actionpack-xml_parser (1.0.2) actionpack (>= 4.0.0, < 5) - actionview (4.2.7) - activesupport (= 4.2.7) + actionview (4.2.7.1) + activesupport (= 4.2.7.1) 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.7) - activesupport (= 4.2.7) + activejob (4.2.7.1) + activesupport (= 4.2.7.1) globalid (>= 0.3.0) - activemodel (4.2.7) - activesupport (= 4.2.7) + activemodel (4.2.7.1) + activesupport (= 4.2.7.1) builder (~> 3.1) - activerecord (4.2.7) - activemodel (= 4.2.7) - activesupport (= 4.2.7) + activerecord (4.2.7.1) + activemodel (= 4.2.7.1) + activesupport (= 4.2.7.1) arel (~> 6.0) activerecord-session_store (0.1.2) actionpack (>= 4.0.0, < 5) @@ -145,7 +145,7 @@ GEM railties (>= 4.0.0, < 5) activerecord-tableless (1.3.4) activerecord (>= 2.3.0) - activesupport (4.2.7) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -200,7 +200,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) color-tools (1.3.0) - concurrent-ruby (1.0.1) + concurrent-ruby (1.0.2) crack (0.4.3) safe_yaml (~> 1.0.0) crowdin-api (0.4.1) @@ -277,7 +277,7 @@ GEM ruby-progressbar (~> 1.4) gherkin (2.12.2) multi_json (~> 1.3) - globalid (0.3.6) + globalid (0.3.7) activesupport (>= 4.1.0) globalize (5.0.1) activemodel (>= 4.2.0, < 4.3) @@ -329,13 +329,13 @@ GEM tilt loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.4) + mime-types (>= 1.16, < 4) method_source (0.8.2) mime-types (2.99.2) mini_portile2 (2.1.0) minisyntax (0.2.5) - minitest (5.8.4) + minitest (5.9.0) mixlib-shellout (2.1.0) multi_json (1.11.3) multi_test (0.1.2) @@ -404,16 +404,16 @@ GEM rack_session_access (0.1.1) builder (>= 2.0.0) rack (>= 1.0.0) - rails (4.2.7) - actionmailer (= 4.2.7) - actionpack (= 4.2.7) - actionview (= 4.2.7) - activejob (= 4.2.7) - activemodel (= 4.2.7) - activerecord (= 4.2.7) - activesupport (= 4.2.7) + rails (4.2.7.1) + actionmailer (= 4.2.7.1) + actionpack (= 4.2.7.1) + actionview (= 4.2.7.1) + activejob (= 4.2.7.1) + activemodel (= 4.2.7.1) + activerecord (= 4.2.7.1) + activesupport (= 4.2.7.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7) + railties (= 4.2.7.1) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -432,14 +432,14 @@ GEM rails (> 3.1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (4.2.7) - actionpack (= 4.2.7) - activesupport (= 4.2.7) + railties (4.2.7.1) + actionpack (= 4.2.7.1) + activesupport (= 4.2.7.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.1.0) raindrops (0.16.0) - rake (11.1.1) + rake (11.2.2) rb-readline (0.5.3) rdoc (4.2.2) json (~> 1.4) @@ -525,7 +525,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.4) + sprockets-rails (3.1.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) @@ -658,7 +658,7 @@ DEPENDENCIES rack-protection! rack-test (~> 0.6.2) rack_session_access - rails (~> 4.2.5) + rails (~> 4.2.7, >= 4.2.7.1) rails-angular-xss! rails-observers rails_12factor