Permalink
Browse files

updating to rails 3.1.0

  • Loading branch information...
1 parent afa0665 commit ed3cb02e0b3b3834f15cb7d31d1daba92ea4bcc4 Ryan Fitzgerald committed Sep 4, 2011
Showing with 60 additions and 78 deletions.
  1. +5 −4 Gemfile
  2. +54 −73 Gemfile.lock
  3. +1 −1 backbone-rails.gemspec
View
@@ -1,10 +1,11 @@
source "http://rubygems.org"
+gem "rails", "~> 3.1.0"
# Bundle edge Rails instead:
-gem 'rails', :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
-gem 'tilt', :git => "git://github.com/rtomayko/tilt.git"
-gem 'sprockets', "~> 2.0.0.beta.13"
-gem 'execjs', :git => "git://github.com/sstephenson/execjs.git"
+# gem 'rails', :git => "git://github.com/rails/rails.git", :branch => "3-1-stable"
+# gem 'tilt', :git => "git://github.com/rtomayko/tilt.git"
+# gem 'sprockets', "~> 2.0.0.beta.13"
+# gem 'execjs', :git => "git://github.com/sstephenson/execjs.git"
gem 'sqlite3'
gem 'sass'
View
@@ -1,83 +1,51 @@
-GIT
- remote: git://github.com/rails/rails.git
- revision: dfcecdecfa039afee220c4d1bb76dcf52fc077cc
- branch: 3-1-stable
+GEM
+ remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
+ actionmailer (3.1.0)
+ actionpack (= 3.1.0)
mail (~> 2.3.0)
- actionpack (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ 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.rc5)
- activesupport (= 3.1.0.rc5)
- 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.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- arel (~> 2.1.4)
+ activerecord (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- activesupport (3.1.0.rc5)
- multi_json (~> 1.0)
- rails (3.1.0.rc5)
- actionmailer (= 3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activerecord (= 3.1.0.rc5)
- activeresource (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- bundler (~> 1.0)
- railties (= 3.1.0.rc5)
- railties (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- rack-ssl (~> 1.3.2)
- rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
-
-GIT
- remote: git://github.com/rtomayko/tilt.git
- revision: a07077f4737754757e99c2d42267f432289ffd13
- specs:
- tilt (1.3.2)
-
-GIT
- remote: git://github.com/sstephenson/execjs.git
- revision: dec2b9d82a9b3712399cb59bffaa3fd2e7c87cba
- specs:
- execjs (1.2.0)
+ activeresource (3.1.0)
+ activemodel (= 3.1.0)
+ activesupport (= 3.1.0)
+ activesupport (3.1.0)
multi_json (~> 1.0)
-
-GEM
- remote: http://rubygems.org/
- specs:
archive-tar-minitar (0.5.2)
- arel (2.1.4)
- bcrypt-ruby (2.1.4)
+ arel (2.2.1)
+ bcrypt-ruby (3.0.0)
builder (3.0.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
- columnize (0.3.3)
+ coffee-script-source (1.1.2)
+ columnize (0.3.4)
ejs (1.0.0)
erubis (2.7.0)
- hike (1.2.0)
+ execjs (1.2.4)
+ multi_json (~> 1.0)
+ hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.13)
railties (~> 3.0)
thor (~> 0.14)
linecache19 (0.5.12)
@@ -91,16 +59,31 @@ GEM
multi_json (1.0.3)
polyglot (0.3.2)
rack (1.3.2)
- rack-cache (1.0.2)
+ rack-cache (1.0.3)
rack (>= 0.4)
- rack-mount (0.8.1)
+ 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)
+ 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)
+ 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)
- rdoc (3.9.1)
+ rdoc (3.9.4)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -111,18 +94,19 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- sass (3.1.4)
- sprockets (2.0.0.beta.13)
+ sass (3.1.7)
+ sprockets (2.0.0)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.3)
+ sqlite3 (1.3.4)
thor (0.14.6)
+ tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
- uglifier (1.0.0)
+ uglifier (1.0.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -132,13 +116,10 @@ PLATFORMS
DEPENDENCIES
coffee-script
ejs
- execjs!
jquery-rails
mocha (>= 0.9.12)
- rails!
+ rails (~> 3.1.0)
ruby-debug19
sass
- sprockets (~> 2.0.0.beta.13)
sqlite3
- tilt!
uglifier
View
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.description = "Quickly setup backbone.js for use with rails 3.1. Generators are provided to quickly get started."
s.files = Dir["lib/**/*"] + Dir["vendor/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
- s.add_dependency('rails', '~> 3.1.0.rc5')
+ s.add_dependency('rails', '~> 3.1.0')
s.add_dependency('coffee-script', '~> 2.2.0')
s.add_dependency('ejs', '~> 1.0.0')

0 comments on commit ed3cb02

Please sign in to comment.