From e45ed19c33c037fb52bd4abeb3772cbe9b00614b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Thu, 6 Dec 2012 19:49:40 +0100
Subject: [PATCH] bump rails_admin
---
Gemfile | 2 +-
Gemfile.lock | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Gemfile b/Gemfile
index dd7fb5adc6..c15b456bc5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,7 +38,7 @@ gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
gem 'messagebus_ruby_api', '1.0.3'
group :production do # we don't install these on travis to speed up test runs
- gem 'rails_admin', '0.2.0'
+ gem 'rails_admin', '0.4.1'
gem 'fastercsv', '1.5.5', :require => false
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
gem 'rack-rewrite', '1.3.1', :require => false
diff --git a/Gemfile.lock b/Gemfile.lock
index 744b842ef1..e8c7d0c2b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -135,7 +135,7 @@ GEM
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
- font-awesome-sass-rails (2.0.0.0)
+ font-awesome-sass-rails (3.0.0.1)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foreigner (1.2.1)
@@ -195,7 +195,7 @@ GEM
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- jquery-ui-rails (2.0.2)
+ jquery-ui-rails (3.0.1)
jquery-rails
railties (>= 3.1.0)
json (1.7.5)
@@ -225,7 +225,7 @@ GEM
multi_json (1.5.0)
multipart-post (1.1.5)
mysql2 (0.3.11)
- nested_form (0.2.3)
+ nested_form (0.3.1)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -272,7 +272,7 @@ GEM
rack-mobile-detect (0.4.0)
rack
rack-piwik (0.1.3)
- rack-pjax (0.6.0)
+ rack-pjax (0.7.0)
nokogiri (~> 1.5)
rack (~> 1.3)
rack-protection (1.2.0)
@@ -292,16 +292,16 @@ GEM
railties (= 3.2.11)
rails-i18n (0.7.2)
i18n (~> 0.5)
- rails_admin (0.2.0)
+ rails_admin (0.4.1)
bootstrap-sass (~> 2.1)
builder (~> 3.0)
coffee-rails (~> 3.1)
- font-awesome-sass-rails (~> 2.0)
+ font-awesome-sass-rails (~> 3.0, >= 3.0.0.1)
haml (~> 3.1)
jquery-rails (~> 2.1)
- jquery-ui-rails (~> 2.0)
+ jquery-ui-rails (~> 3.0)
kaminari (~> 0.14)
- nested_form (~> 0.2.3)
+ nested_form (~> 0.2)
rack-pjax (~> 0.6)
rails (~> 3.1)
remotipart (~> 1.0)
@@ -466,7 +466,7 @@ DEPENDENCIES
rack-ssl (= 1.3.2)
rails (= 3.2.11)
rails-i18n (= 0.7.2)
- rails_admin (= 0.2.0)
+ rails_admin (= 0.4.1)
rails_autolink (= 1.0.9)
rb-fsevent (= 0.9.2)
rb-inotify (= 0.8.8)
--
GitLab