From d3953720a8e2e2889027d339a5b75cca035f49a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 25 May 2013 15:19:57 +0200 Subject: [PATCH] bump rails_admin --- Gemfile | 2 +- Gemfile.lock | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 99e4768f6..4f16cf6c4 100644 --- a/Gemfile +++ b/Gemfile @@ -124,7 +124,7 @@ group :production do # we don't install these on travis to speed up test runs # Administration - gem 'rails_admin', '0.4.7' + gem 'rails_admin', '0.4.9' # Analytics diff --git a/Gemfile.lock b/Gemfile.lock index 3e62b5631..713601e5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,9 +125,8 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac - font-awesome-sass-rails (3.0.2.2) - railties (>= 3.1.1) - sass-rails (>= 3.1.1) + font-awesome-rails (3.1.1.3) + railties (>= 3.2, < 5.0) foreigner (1.4.1) activerecord (>= 3.0.0) foreman (0.62.0) @@ -280,13 +279,13 @@ GEM railties (= 3.2.13) rails-i18n (0.7.3) i18n (~> 0.5) - rails_admin (0.4.7) + rails_admin (0.4.9) bootstrap-sass (~> 2.2) builder (~> 3.0) - coffee-rails (~> 3.1) - font-awesome-sass-rails (~> 3.0, >= 3.0.0.1) + coffee-rails (>= 3.1, < 5) + font-awesome-rails (~> 3.0) haml (~> 4.0) - jquery-rails (~> 2.1) + jquery-rails (>= 2.1, < 4) jquery-ui-rails (~> 3.0) kaminari (~> 0.14) nested_form (~> 0.3) @@ -342,8 +341,8 @@ GEM ruby-oembed (0.8.8) ruby-progressbar (1.0.2) rubyzip (0.9.9) - safe_yaml (0.9.1) - sass (3.2.7) + safe_yaml (0.9.3) + sass (3.2.9) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -382,7 +381,7 @@ GEM tilt (1.3.7) timecop (0.6.1) timers (1.1.0) - treetop (1.4.12) + treetop (1.4.14) polyglot polyglot (>= 0.3.1) twitter (4.6.2) @@ -464,7 +463,7 @@ DEPENDENCIES rack-ssl (= 1.3.3) rails (= 3.2.13) rails-i18n (= 0.7.3) - rails_admin (= 0.4.7) + rails_admin (= 0.4.9) rails_autolink (= 1.0.9) rb-fsevent (= 0.9.3) rb-inotify (= 0.9.0)