diff --git a/Gemfile b/Gemfile index 7e031f650..2db8a787e 100644 --- a/Gemfile +++ b/Gemfile @@ -156,7 +156,7 @@ group :production do # we don't install these on travis to speed up test runs # Administration - gem 'rails_admin', '0.6.3' + gem 'rails_admin', '0.6.5' # Analytics diff --git a/Gemfile.lock b/Gemfile.lock index cf06fee1c..d2fd83541 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM ffi (~> 1.0, >= 1.0.11) chunky_png (1.3.1) coderay (1.1.0) - coffee-rails (4.0.1) + coffee-rails (4.1.0) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) coffee-script (2.3.0) @@ -242,7 +242,7 @@ GEM jquery-rails (3.1.2) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.2.1) + jquery-ui-rails (5.0.1) railties (>= 3.2.16) js-routes (0.9.9) railties (>= 3.2) @@ -372,13 +372,13 @@ GEM rails-timeago (2.11.0) actionpack (>= 3.1) activesupport (>= 3.1) - rails_admin (0.6.3) + rails_admin (0.6.5) builder (~> 3.1) coffee-rails (~> 4.0) - font-awesome-rails (>= 3.0) + font-awesome-rails (>= 3.0, < 5) haml (~> 4.0) jquery-rails (~> 3.0) - jquery-ui-rails (~> 4.0) + jquery-ui-rails (~> 5.0) kaminari (~> 0.14) nested_form (~> 0.3) rack-pjax (~> 0.7) @@ -432,7 +432,7 @@ GEM ruby-oembed (0.8.10) ruby-progressbar (1.5.1) rubyzip (1.1.6) - safe_yaml (1.0.3) + safe_yaml (1.0.4) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -466,10 +466,10 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) + sprockets-rails (2.2.0) actionpack (>= 3.0) activesupport (>= 3.0) - sprockets (~> 2.8) + sprockets (>= 2.8, < 4.0) subexec (0.2.3) systemu (2.6.4) test_after_commit (0.2.7) @@ -585,7 +585,7 @@ DEPENDENCIES rails-assets-punycode (= 1.3.1) rails-i18n (= 4.0.3) rails-timeago (= 2.11.0) - rails_admin (= 0.6.3) + rails_admin (= 0.6.5) rails_autolink (= 1.1.6) rb-fsevent (= 0.9.4) rb-inotify (= 0.9.5)