Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxwell Salzberg <maxwell@joindiaspora.com>2012-05-15 06:58:07 +0400
committerMaxwell Salzberg <maxwell@joindiaspora.com>2012-05-15 06:58:07 +0400
commit4d58940e519036a3ce4471128396ece768bdea53 (patch)
treed3542a5ef9460d3425095710ed630bea7dc4c10c
parent6282450418f17a7b31c3a11ce7f9481332247ccd (diff)
update rails admin [ci skip]
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
2 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile b/Gemfile
index 2b2adb59e..f76c48612 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem 'newrelic_rpm'
gem "rpm_contrib", "~> 2.1.7"
group :production do # we don't install these on travis to speed up test runs
- gem 'rails_admin', '~> 0.0.2'
+ gem 'rails_admin', '~> 0.0.3'
gem 'rack-ssl', :require => 'rack/ssl'
gem 'rack-rewrite', '~> 1.2.1', :require => false
gem 'rack-piwik', :require => 'rack/piwik'
diff --git a/Gemfile.lock b/Gemfile.lock
index 489b46dbb..bcdfb804a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
fog
bbenezech-nested_form (0.0.6)
bcrypt-ruby (3.0.1)
- bootstrap-sass (2.0.2)
+ bootstrap-sass (2.0.3)
builder (3.0.0)
capistrano (2.9.0)
highline
@@ -120,7 +120,7 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
+ coffee-script-source (1.3.2)
columnize (0.3.6)
cookiejar (0.3.0)
crack (0.3.1)
@@ -250,7 +250,7 @@ GEM
jquery-ui-rails (0.2.2)
jquery-rails
railties (>= 3.1.0)
- json (1.7.1)
+ json (1.7.3)
jwt (0.1.4)
json (>= 1.2.4)
kaminari (0.13.0)
@@ -357,7 +357,7 @@ GEM
railties (= 3.1.4)
rails-i18n (0.6.3)
i18n (~> 0.5)
- rails_admin (0.0.2)
+ rails_admin (0.0.3)
bbenezech-nested_form (~> 0.0.6)
bootstrap-sass (~> 2.0)
builder (~> 3.0)
@@ -424,7 +424,7 @@ GEM
ruby-oembed (0.8.7)
ruby-progressbar (0.0.10)
rubyzip (0.9.8)
- sass (3.1.17)
+ sass (3.1.18)
sass-rails (3.1.4)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
@@ -563,7 +563,7 @@ DEPENDENCIES
rack-ssl
rails (= 3.1.4)
rails-i18n
- rails_admin (~> 0.0.2)
+ rails_admin (~> 0.0.3)
rails_autolink
redcarpet (= 2.0.1)
remotipart (~> 1.0)