diff --git a/Gemfile.lock b/Gemfile.lock index f92226a3c..b7159592d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,7 +101,7 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) compass (0.12.7) chunky_png (~> 1.2) fssm (>= 0.2.7) @@ -196,8 +196,9 @@ GEM httpclient (~> 2.2) nokogiri (~> 1.5) jmespath (1.3.1) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.2.2) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) @@ -303,9 +304,9 @@ GEM rack-attack (5.0.1) rack rack-cors (0.4.0) - rack-pjax (0.8.0) + rack-pjax (1.0.0) nokogiri (~> 1.5) - rack (~> 1.1) + rack (>= 1.1) rack-test (0.6.3) rack (>= 1.0) rack-timeout (0.4.2) @@ -353,7 +354,7 @@ GEM rails_12factor (0.0.3) rails_serve_static_assets rails_stdout_logging - rails_admin (0.8.1) + rails_admin (1.1.1) builder (~> 3.1) coffee-rails (~> 4.0) font-awesome-rails (>= 3.0, < 5) @@ -362,10 +363,9 @@ GEM jquery-ui-rails (~> 5.0) kaminari (~> 0.14) nested_form (~> 0.3) - rack-pjax (~> 0.7) - rails (~> 4.0) - remotipart (~> 1.0) - safe_yaml (~> 1.0) + rack-pjax (>= 0.7) + rails (>= 4.0, < 6) + remotipart (~> 1.3) sass-rails (>= 4.0, < 6) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) @@ -377,7 +377,7 @@ GEM rainbow (2.2.1) rake (12.0.0) ref (2.0.0) - remotipart (1.2.1) + remotipart (1.3.1) responders (2.3.0) railties (>= 4.2.0, < 5.1) rspec-core (3.5.4)