diff --git a/Gemfile b/Gemfile index b18c8a94..37ee5c46 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://rails-assets.org' -gem 'rails', '4.1.7' +gem 'rails', '4.1.8' gem 'pg', group: :postgres gem 'mysql2', group: :mysql diff --git a/Gemfile.lock b/Gemfile.lock index 09088cf9..61cd1f87 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,27 +2,27 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actionmailer (4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) + actionmailer (4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.7) - actionview (= 4.1.7) - activesupport (= 4.1.7) + actionpack (4.1.8) + actionview (= 4.1.8) + activesupport (= 4.1.8) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.7) - activesupport (= 4.1.7) + actionview (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.7) - activesupport (= 4.1.7) + activemodel (4.1.8) + activesupport (= 4.1.8) builder (~> 3.1) - activerecord (4.1.7) - activemodel (= 4.1.7) - activesupport (= 4.1.7) + activerecord (4.1.8) + activemodel (= 4.1.8) + activesupport (= 4.1.8) arel (~> 5.0.0) - activesupport (4.1.7) + activesupport (4.1.8) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -75,7 +75,7 @@ GEM railties (>= 3.2, < 5.0) font-kit-rails (1.1.0) rails - haml (4.0.5) + haml (4.0.6) tilt hike (1.2.3) http_accept_language (2.0.2) @@ -111,27 +111,27 @@ GEM rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) - rails (4.1.7) - actionmailer (= 4.1.7) - actionpack (= 4.1.7) - actionview (= 4.1.7) - activemodel (= 4.1.7) - activerecord (= 4.1.7) - activesupport (= 4.1.7) + rails (4.1.8) + actionmailer (= 4.1.8) + actionpack (= 4.1.8) + actionview (= 4.1.8) + activemodel (= 4.1.8) + activerecord (= 4.1.8) + activesupport (= 4.1.8) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.7) + railties (= 4.1.8) sprockets-rails (~> 2.0) - rails-assets-growl (1.2.0) + rails-assets-growl (1.2.4) rails-assets-jquery rails-assets-jquery (2.1.1) - railties (4.1.7) - actionpack (= 4.1.7) - activesupport (= 4.1.7) + railties (4.1.8) + actionpack (= 4.1.8) + activesupport (= 4.1.8) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.13.0) - rake (10.4.0) - rdoc (4.1.2) + rake (10.4.2) + rdoc (4.2.0) json (~> 1.4) responders (1.1.2) railties (>= 3.2, < 4.2) @@ -151,7 +151,7 @@ GEM rspec-mocks (~> 3.0.0) rspec-support (~> 3.0.0) rspec-support (3.0.4) - ruby-progressbar (1.5.1) + ruby-progressbar (1.7.0) sass (3.2.19) sass-rails (4.0.5) railties (>= 4.0.0, < 5.0) @@ -172,7 +172,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.2.1) + sprockets-rails (2.2.2) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) @@ -183,7 +183,7 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) - turbolinks (2.5.2) + turbolinks (2.5.3) coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) @@ -228,7 +228,7 @@ DEPENDENCIES nprogress-rails pg poltergeist - rails (= 4.1.7) + rails (= 4.1.8) rails-assets-growl rspec-rails (~> 3.0.0) ruby-progressbar