diff options
| -rw-r--r-- | Gemfile | 8 | ||||
| -rw-r--r-- | Gemfile.lock | 86 |
2 files changed, 47 insertions, 47 deletions
@@ -1,6 +1,6 @@ source :rubygems -gem 'rails', '3.1.0.rc6' +gem 'rails', '3.1.0' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -12,8 +12,8 @@ gem 'json' # Gems used only for assets and not required # in production environments by default. group :assets do - gem 'sass-rails', "~> 3.1.0.rc6" - gem 'coffee-rails', "~> 3.1.0.rc6" + gem 'sass-rails', "~> 3.1.0" + gem 'coffee-rails', "~> 3.1.0" gem 'uglifier' end @@ -38,7 +38,7 @@ gem "diff-lcs", :require => "diff/lcs" gem "nokogiri" gem "text-format", :require => "text/format" -gem "thinking-sphinx", "=2.0.7" +gem "thinking-sphinx", "2.0.7" # gem "rdoc" diff --git a/Gemfile.lock b/Gemfile.lock index 370e133..5be54ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,37 +1,37 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0.rc6) - actionpack (= 3.1.0.rc6) + actionmailer (3.1.0) + actionpack (= 3.1.0) mail (~> 2.3.0) - actionpack (3.1.0.rc6) - activemodel (= 3.1.0.rc6) - activesupport (= 3.1.0.rc6) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) builder (~> 3.0.0) erubis (~> 2.7.0) i18n (~> 0.6) rack (~> 1.3.2) - rack-cache (~> 1.0.2) - rack-mount (~> 0.8.1) - rack-test (~> 0.6.0) - sprockets (~> 2.0.0.beta.12) - activemodel (3.1.0.rc6) - activesupport (= 3.1.0.rc6) - bcrypt-ruby (~> 2.1.4) + rack-cache (~> 1.0.3) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) builder (~> 3.0.0) i18n (~> 0.6) - activerecord (3.1.0.rc6) - activemodel (= 3.1.0.rc6) - activesupport (= 3.1.0.rc6) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) arel (~> 2.2.1) tzinfo (~> 0.3.29) - activeresource (3.1.0.rc6) - activemodel (= 3.1.0.rc6) - activesupport (= 3.1.0.rc6) - activesupport (3.1.0.rc6) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) multi_json (~> 1.0) arel (2.2.1) - bcrypt-ruby (2.1.4) + bcrypt-ruby (3.0.0) builder (3.0.0) capistrano (2.8.0) highline @@ -41,7 +41,7 @@ GEM net-ssh-gateway (>= 1.1.0) ci_reporter (1.6.5) builder (>= 2.1.2) - coffee-rails (3.1.0.rc.6) + coffee-rails (3.1.0) coffee-script (>= 2.2.0) railties (~> 3.1.0.rc1) coffee-script (2.2.0) @@ -57,7 +57,7 @@ GEM multi_json (~> 1.0) fastercsv (1.5.4) highline (1.6.2) - hike (1.2.0) + hike (1.2.1) i18n (0.6.0) json (1.5.3) linecache (0.46) @@ -88,32 +88,32 @@ GEM prototype-rails (0.3.1) rails (~> 3.1.0.beta1) rack (1.3.2) - rack-cache (1.0.2) + rack-cache (1.0.3) rack (>= 0.4) - rack-mount (0.8.2) + rack-mount (0.8.3) rack (>= 1.0.0) rack-ssl (1.3.2) rack rack-test (0.6.1) rack (>= 1.0) - rails (3.1.0.rc6) - actionmailer (= 3.1.0.rc6) - actionpack (= 3.1.0.rc6) - activerecord (= 3.1.0.rc6) - activeresource (= 3.1.0.rc6) - activesupport (= 3.1.0.rc6) + rails (3.1.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) bundler (~> 1.0) - railties (= 3.1.0.rc6) - railties (3.1.0.rc6) - actionpack (= 3.1.0.rc6) - activesupport (= 3.1.0.rc6) + railties (= 3.1.0) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2) rcov (0.9.9) - rdoc (3.9.2) + rdoc (3.9.4) require_relative (1.0.2) riddle (1.4.0) rspec (2.6.0) @@ -130,11 +130,11 @@ GEM ruby-debug-base (0.10.4) linecache (>= 0.3) sass (3.1.7) - sass-rails (3.1.0.rc.6) - actionpack (~> 3.1.0.rc6) - railties (~> 3.1.0.rc6) + sass-rails (3.1.0) + actionpack (~> 3.1.0) + railties (~> 3.1.0) sass (>= 3.1.4) - sprockets (2.0.0.beta.13) + sprockets (2.0.0) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -147,7 +147,7 @@ GEM activerecord (>= 3.0.3) riddle (>= 1.3.3) thor (0.14.6) - tilt (1.3.2) + tilt (1.3.3) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -164,7 +164,7 @@ PLATFORMS DEPENDENCIES capistrano ci_reporter - coffee-rails (~> 3.1.0.rc6) + coffee-rails (~> 3.1.0) diff-lcs fastercsv json @@ -172,12 +172,12 @@ DEPENDENCIES mysql2 nokogiri prototype-rails - rails (= 3.1.0.rc6) + rails (= 3.1.0) rcov require_relative rspec ruby-debug - sass-rails (~> 3.1.0.rc6) + sass-rails (~> 3.1.0) text-format thin thinking-sphinx (= 2.0.7) |