diff --git a/Gemfile b/Gemfile index c32326c91e7d913d454be0398d02de53afb28fe4..0df2349f30fb2ebe4576319b2fcedd2dd7bf8deb 100644 --- a/Gemfile +++ b/Gemfile @@ -31,7 +31,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.1.1' + gem 'rails_admin', '0.2.0' 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 b62e5a5558b6c1257c78b5ccb058db634e49b9b0..d535e3bcba20d289e8b85dcc4ade842d83f4b248 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -67,7 +67,7 @@ GEM fog bcrypt-ruby (3.0.1) bootstrap-sass (2.1.1.0) - builder (3.0.3) + builder (3.0.4) capistrano (2.12.0) highline net-scp (>= 1.0.0) @@ -151,6 +151,9 @@ GEM net-ssh (>= 2.1.3) nokogiri (~> 1.5.0) ruby-hmac + font-awesome-sass-rails (2.0.0.0) + railties (>= 3.1.1) + sass-rails (>= 3.1.1) foreigner (1.2.1) activerecord (>= 3.0.0) foreman (0.60.2) @@ -208,7 +211,7 @@ GEM jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) - jquery-ui-rails (2.0.1) + jquery-ui-rails (2.0.2) jquery-rails railties (>= 3.1.0) jruby-pageant (1.1.1) @@ -303,16 +306,17 @@ GEM activesupport (= 3.2.8) bundler (~> 1.0) railties (= 3.2.8) - rails_admin (0.1.1) - bootstrap-sass (~> 2.0) + rails_admin (0.2.0) + bootstrap-sass (~> 2.1) builder (~> 3.0) coffee-rails (~> 3.1) + font-awesome-sass-rails (~> 2.0) haml (~> 3.1) - jquery-rails (~> 2.0) + jquery-rails (~> 2.1) jquery-ui-rails (~> 2.0) - kaminari (~> 0.12) + kaminari (~> 0.14) nested_form (~> 0.2.3) - rack-pjax (~> 0.5) + rack-pjax (~> 0.6) rails (~> 3.1) remotipart (~> 1.0) sass-rails (~> 3.1) @@ -361,7 +365,7 @@ GEM ruby-oembed (0.8.7) ruby-progressbar (1.0.2) rubyzip (0.9.9) - sass (3.2.2) + sass (3.2.3) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) @@ -472,7 +476,7 @@ DEPENDENCIES rack-ssl (= 1.3.2) rails (= 3.2.8) rails-i18n! - rails_admin (= 0.1.1) + rails_admin (= 0.2.0) rails_autolink (= 1.0.9) rb-inotify (= 0.8.8) redcarpet (= 2.2.2)