From 181b9b7f1f06f579db69b7b84e3e18648ae0c31b Mon Sep 17 00:00:00 2001 From: David Davis Date: Sun, 26 Feb 2012 13:33:18 -0500 Subject: [PATCH] Upgraded rails and mongoid for make benefit glorious application of rubeque --- Gemfile | 6 +- Gemfile.lock | 95 ++++++++++----------- app/assets/stylesheets/application.css.scss | 2 +- 3 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Gemfile b/Gemfile index 7f011d7..6fd3e6a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.3' +gem "rails", "~> 3.2.1" gem "mongoid", "~> 2.4" gem "bson_ext", "~> 1.5" gem "coderay", "~> 1.0.5" @@ -26,8 +26,8 @@ gem "omniauth-openid" # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', '~> 3.1.5' - gem 'coffee-rails', '~> 3.1.1' + gem 'sass-rails', '~> 3.2.3' + gem 'coffee-rails', '~> 3.2.1' gem 'uglifier', '>= 1.0.3' end diff --git a/Gemfile.lock b/Gemfile.lock index 4187185..0e12818 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,38 +7,37 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.3) - actionpack (= 3.1.3) - mail (~> 2.3.0) - actionpack (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) + actionmailer (3.2.1) + actionpack (= 3.2.1) + mail (~> 2.4.0) + actionpack (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.5) + journey (~> 1.0.1) + rack (~> 1.4.0) rack-cache (~> 1.1) - rack-mount (~> 0.8.2) rack-test (~> 0.6.1) - sprockets (~> 2.0.3) - activemodel (3.1.3) - activesupport (= 3.1.3) + sprockets (~> 2.1.2) + activemodel (3.2.1) + activesupport (= 3.2.1) builder (~> 3.0.0) - i18n (~> 0.6) - activerecord (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) - arel (~> 2.2.1) + activerecord (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) + arel (~> 3.0.0) tzinfo (~> 0.3.29) - activeresource (3.1.3) - activemodel (= 3.1.3) - activesupport (= 3.1.3) - activesupport (3.1.3) + activeresource (3.2.1) + activemodel (= 3.2.1) + activesupport (= 3.2.1) + activesupport (3.2.1) + i18n (~> 0.6) multi_json (~> 1.0) addressable (2.2.6) ansi (1.4.1) archive-tar-minitar (0.5.2) - arel (2.2.1) + arel (3.0.2) awesome_print (1.0.2) bcrypt-ruby (3.0.1) bson (1.5.2) @@ -58,9 +57,9 @@ GEM railties (~> 3.0) thor (~> 0.14) coderay (1.0.5) - coffee-rails (3.1.1) + coffee-rails (3.2.2) coffee-script (>= 2.2.0) - railties (~> 3.1.0) + railties (~> 3.2.0) coffee-script (2.2.0) coffee-script-source execjs @@ -109,6 +108,7 @@ GEM i18n (0.6.0) interactive_editor (0.0.10) spoon (>= 0.0.1) + journey (1.0.3) jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) @@ -124,14 +124,14 @@ GEM looksee (1.0.3) macaddr (1.5.0) systemu (>= 2.4.0) - mail (2.3.0) + mail (2.4.1) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.17.2) mongo (1.5.2) bson (= 1.5.2) - mongoid (2.4.0) + mongoid (2.4.5) activemodel (~> 3.1) mongo (~> 1.3) tzinfo (~> 0.3.22) @@ -164,11 +164,9 @@ GEM omniauth-oauth (~> 1.0) orm_adapter (0.0.6) polyglot (0.3.3) - rack (1.3.6) + rack (1.4.1) rack-cache (1.1) rack (>= 0.4) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-openid (1.3.1) rack (>= 1.1.0) ruby-openid (>= 2.1.8) @@ -176,17 +174,17 @@ GEM rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.3) - actionmailer (= 3.1.3) - actionpack (= 3.1.3) - activerecord (= 3.1.3) - activeresource (= 3.1.3) - activesupport (= 3.1.3) + rails (3.2.1) + actionmailer (= 3.2.1) + actionpack (= 3.2.1) + activerecord (= 3.2.1) + activeresource (= 3.2.1) + activesupport (= 3.2.1) bundler (~> 1.0) - railties (= 3.1.3) - railties (3.1.3) - actionpack (= 3.1.3) - activesupport (= 3.1.3) + railties (= 3.2.1) + railties (3.2.1) + actionpack (= 3.2.1) + activesupport (= 3.2.1) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -222,12 +220,11 @@ GEM ruby_core_source (0.1.5) archive-tar-minitar (>= 0.5.2) rubyzip (0.9.5) - sass (3.1.12) - sass-rails (3.1.5) - actionpack (~> 3.1.0) - railties (~> 3.1.0) - sass (~> 3.1.10) - tilt (~> 1.3.2) + sass (3.1.15) + sass-rails (3.2.4) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) selenium-webdriver (2.17.0) childprocess (>= 0.2.5) ffi (~> 1.0.9) @@ -236,7 +233,7 @@ GEM sicuro (0.0.2) fakefs spoon (0.0.1) - sprockets (2.0.3) + sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -269,7 +266,7 @@ DEPENDENCIES capybara chosen-rails coderay (~> 1.0.5) - coffee-rails (~> 3.1.1) + coffee-rails (~> 3.2.1) cucumber-rails database_cleaner devise (~> 2.0.4) @@ -290,13 +287,13 @@ DEPENDENCIES omniauth-github omniauth-openid omniauth-twitter - rails (= 3.1.3) + rails (~> 3.2.1) rinku rspec-rails (~> 2.8) ruby-debug-base19 (= 0.11.26) ruby-debug19 (= 0.11.6) rubycop! - sass-rails (~> 3.1.5) + sass-rails (~> 3.2.3) selenium-webdriver sicuro turn (= 0.8.2) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 341fe83..b30a021 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -298,7 +298,7 @@ p#solutions-link { float: right; top: -44px; } -form#user_edit { +form#edit_user { label { display: block; margin-bottom: 5px;