diff --git a/Gemfile b/Gemfile index 4619f811..7a0ed5e5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://rails-assets.org' -gem 'rails', '~> 4.2.0' +gem 'rails', '~> 4.2.11', '>= 4.2.11.1' gem 'rails-i18n' gem 'i18n-js', '= 3.0.0.rc10' diff --git a/Gemfile.lock b/Gemfile.lock index 03b2a734..bd684a9e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,36 +9,36 @@ GEM remote: https://rails-assets.org/ specs: CFPropertyList (2.3.5) - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.11.1) + actionview (= 4.2.11.1) + activesupport (= 4.2.11.1) 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.8) - activesupport (= 4.2.8) + actionview (4.2.11.1) + activesupport (= 4.2.11.1) 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.8) - activesupport (= 4.2.8) + activejob (4.2.11.1) + activesupport (= 4.2.11.1) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.11.1) + activesupport (= 4.2.11.1) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.11.1) + activemodel (= 4.2.11.1) + activesupport (= 4.2.11.1) arel (~> 6.0) - activesupport (4.2.8) + activesupport (4.2.11.1) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -84,7 +84,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - climate_control (0.1.0) + climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -139,7 +139,7 @@ GEM multipart-post (>= 1.2, < 3) faraday_middleware (0.11.0.1) faraday (>= 0.7.4, < 1.0) - ffi (1.9.18) + ffi (1.10.0) fission (0.5.0) CFPropertyList (~> 2.2) fog (1.40.0) @@ -285,8 +285,8 @@ GEM foreman (0.84.0) thor (~> 0.19.1) formatador (0.2.5) - globalid (0.3.7) - activesupport (>= 4.1.0) + globalid (0.4.2) + activesupport (>= 4.2.0) guard (2.14.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -347,7 +347,8 @@ GEM rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) ruby_dep (~> 1.2) - loofah (2.0.3) + loofah (2.2.3) + crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.0.11) mail (2.6.4) @@ -359,8 +360,8 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) mimemagic (0.3.0) - mini_portile2 (2.1.0) - minitest (5.10.1) + mini_portile2 (2.4.0) + minitest (5.11.3) momentjs-rails (2.17.1) railties (>= 3.1) multi_json (1.12.1) @@ -373,10 +374,10 @@ GEM net-ssh (>= 2.6.5) net-ssh (4.1.0) newrelic_rpm (4.2.0.334) - nokogiri (1.7.1) - mini_portile2 (~> 2.1.0) - nokogumbo (1.4.10) - nokogiri + nokogiri (1.10.1) + mini_portile2 (~> 2.4.0) + nokogumbo (2.0.1) + nokogiri (~> 1.8, >= 1.8.4) notiffany (0.1.1) nenv (~> 0.1) shellany (~> 0.0) @@ -413,24 +414,24 @@ GEM method_source (~> 0.8.1) slop (~> 3.4) public_suffix (2.0.5) - rack (1.6.5) + rack (1.6.11) rack-pjax (1.0.0) nokogiri (~> 1.5) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (1.5.5) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.11.1) + actionmailer (= 4.2.11.1) + actionpack (= 4.2.11.1) + actionview (= 4.2.11.1) + activejob (= 4.2.11.1) + activemodel (= 4.2.11.1) + activerecord (= 4.2.11.1) + activesupport (= 4.2.11.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.11.1) sprockets-rails rails-assets-growl (1.3.2) rails-assets-jquery @@ -441,8 +442,8 @@ GEM activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) + rails-html-sanitizer (1.0.4) + loofah (~> 2.2, >= 2.2.2) rails-i18n (4.0.9) i18n (~> 0.7) railties (~> 4.0) @@ -459,9 +460,9 @@ GEM rails (>= 4.0, < 6) remotipart (~> 1.3) sass-rails (>= 4.0, < 6) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.11.1) + actionpack (= 4.2.11.1) + activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.18.0) @@ -478,8 +479,9 @@ GEM redcarpet (3.4.0) redis (3.3.3) remotipart (1.3.1) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + responders (2.4.1) + actionpack (>= 4.2.0, < 6.0) + railties (>= 4.2.0, < 6.0) rollbar (2.14.1) multi_json rspec-core (3.5.4) @@ -501,10 +503,10 @@ GEM rspec-support (3.5.0) ruby-progressbar (1.8.1) ruby_dep (1.5.0) - sanitize (4.4.0) + sanitize (5.0.0) crass (~> 1.0.2) - nokogiri (>= 1.4.4) - nokogumbo (~> 1.4.1) + nokogiri (>= 1.8.0) + nokogumbo (~> 2.0) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -537,7 +539,7 @@ GEM tilt (>= 1.3, < 3) slop (3.6.0) spring (1.3.6) - sprockets (2.12.4) + sprockets (2.12.5) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -582,7 +584,7 @@ GEM memoizable (~> 0.4.2) naught (~> 1.1) simple_oauth (~> 0.3.1) - tzinfo (1.2.3) + tzinfo (1.2.5) thread_safe (~> 0.1) uglifier (3.1.12) execjs (>= 0.3.0, < 3) @@ -659,7 +661,7 @@ DEPENDENCIES pghero poltergeist questiongenerator! - rails (~> 4.2.0) + rails (~> 4.2.11, >= 4.2.11.1) rails-assets-growl rails-assets-jquery (~> 2.2.0) rails-i18n @@ -693,4 +695,4 @@ DEPENDENCIES will_paginate-bootstrap BUNDLED WITH - 1.16.3 + 1.17.3