diff --git a/Gemfile b/Gemfile index 2474d3fcd..40ff92172 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '4.1.10' +gem 'rails', '4.1.13' gem 'rails-observers' gem 'activerecord-session_store' diff --git a/Gemfile.lock b/Gemfile.lock index 3986f0b50..512fb978c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,31 +1,31 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (4.1.10) - actionpack (= 4.1.10) - actionview (= 4.1.10) + actionmailer (4.1.13) + actionpack (= 4.1.13) + actionview (= 4.1.13) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.10) - actionview (= 4.1.10) - activesupport (= 4.1.10) + actionpack (4.1.13) + actionview (= 4.1.13) + activesupport (= 4.1.13) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.10) - activesupport (= 4.1.10) + actionview (4.1.13) + activesupport (= 4.1.13) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.10) - activesupport (= 4.1.10) + activemodel (4.1.13) + activesupport (= 4.1.13) builder (~> 3.1) - activerecord (4.1.10) - activemodel (= 4.1.10) - activesupport (= 4.1.10) + activerecord (4.1.13) + activemodel (= 4.1.13) + activesupport (= 4.1.13) arel (~> 5.0.0) activerecord-session_store (0.1.1) actionpack (>= 4.0.0, < 5) activerecord (>= 4.0.0, < 5) railties (>= 4.0.0, < 5) - activesupport (4.1.10) + activesupport (4.1.13) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) @@ -36,10 +36,10 @@ GEM ast (2.1.0) astrolabe (1.3.1) parser (~> 2.2) - autoprefixer-rails (5.2.1.2) + autoprefixer-rails (5.2.1.3) execjs json - browser (0.9.1) + browser (1.0.1) buftok (0.2.0) builder (3.2.2) childprocess (0.5.6) @@ -117,7 +117,7 @@ GEM multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - mysql2 (0.3.19) + mysql2 (0.3.20) naught (1.0.0) nenv (0.2.0) net-ldap (0.11) @@ -165,21 +165,21 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.1.10) - actionmailer (= 4.1.10) - actionpack (= 4.1.10) - actionview (= 4.1.10) - activemodel (= 4.1.10) - activerecord (= 4.1.10) - activesupport (= 4.1.10) + rails (4.1.13) + actionmailer (= 4.1.13) + actionpack (= 4.1.13) + actionview (= 4.1.13) + activemodel (= 4.1.13) + activerecord (= 4.1.13) + activesupport (= 4.1.13) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.10) + railties (= 4.1.13) sprockets-rails (~> 2.0) rails-observers (0.1.2) activemodel (~> 4.0) - railties (4.1.10) - actionpack (= 4.1.10) - activesupport (= 4.1.10) + railties (4.1.13) + actionpack (= 4.1.13) + activesupport (= 4.1.13) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (2.0.0) @@ -196,7 +196,7 @@ GEM ruby-progressbar (~> 1.4) ruby-progressbar (1.7.5) rubyzip (1.1.7) - sass (3.4.16) + sass (3.4.18) sass-rails (5.0.3) railties (>= 4.0.0, < 5.0) sass (~> 3.1) @@ -254,7 +254,7 @@ GEM simple_oauth (~> 0.3.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) websocket (1.2.2) @@ -292,7 +292,7 @@ DEPENDENCIES omniauth-twitter puma rack-livereload - rails (= 4.1.10) + rails (= 4.1.13) rails-observers rb-fsevent rubocop