Browse files

use rails gem

  • Loading branch information...
1 parent da68bbc commit 2b51857e2666971f3ec1c4147f12ca112701ef7b @ngauthier committed Apr 25, 2012
Showing with 43 additions and 50 deletions.
  1. +1 −2 Gemfile
  2. +42 −48 Gemfile.lock
View
3 Gemfile
@@ -1,7 +1,6 @@
source 'http://rubygems.org'
-#gem 'rails', '3.2.1'
-gem 'rails', :git => 'https://github.com/rails/rails.git', :branch => "3-2-stable"
+gem 'rails'
gem 'sqlite3'
gem 'jquery-rails'
View
90 Gemfile.lock
@@ -1,56 +1,35 @@
-GIT
- remote: https://github.com/rails/rails.git
- revision: 4ca633e4663b62653ee017e5fd02dd86f06d1200
- branch: 3-2-stable
+GEM
+ remote: http://rubygems.org/
specs:
- actionmailer (3.2.1)
- actionpack (= 3.2.1)
- mail (~> 2.4.0)
- actionpack (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
+ actionmailer (3.2.3)
+ actionpack (= 3.2.3)
+ mail (~> 2.4.4)
+ actionpack (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
- activemodel (3.2.1)
- activesupport (= 3.2.1)
+ activemodel (3.2.3)
+ activesupport (= 3.2.3)
builder (~> 3.0.0)
- activerecord (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- arel (~> 3.0.0)
+ activerecord (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.1)
- activemodel (= 3.2.1)
- activesupport (= 3.2.1)
- activesupport (3.2.1)
+ activeresource (3.2.3)
+ activemodel (= 3.2.3)
+ activesupport (= 3.2.3)
+ activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
- 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.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)
- thor (~> 0.14.6)
-
-GEM
- remote: http://rubygems.org/
- specs:
addressable (2.2.6)
- arel (3.0.0)
+ arel (3.0.2)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -84,28 +63,43 @@ GEM
guard (>= 0.10.0)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.1)
+ journey (1.0.3)
jquery-rails (2.0.0)
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
- json (1.6.5)
+ json (1.6.6)
launchy (2.0.5)
addressable (~> 2.2.6)
- mail (2.4.1)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.17.2)
+ mime-types (1.18)
multi_json (1.0.4)
nokogiri (1.5.0)
polyglot (0.3.3)
rack (1.4.1)
- rack-cache (1.1)
+ rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
+ rails (3.2.3)
+ actionmailer (= 3.2.3)
+ actionpack (= 3.2.3)
+ activerecord (= 3.2.3)
+ activeresource (= 3.2.3)
+ activesupport (= 3.2.3)
+ bundler (~> 1.0)
+ railties (= 3.2.3)
+ railties (3.2.3)
+ actionpack (= 3.2.3)
+ activesupport (= 3.2.3)
+ rack-ssl (~> 1.3.2)
+ rake (>= 0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
@@ -143,7 +137,7 @@ GEM
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.31)
+ tzinfo (0.3.33)
uglifier (1.2.3)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -163,7 +157,7 @@ DEPENDENCIES
guard-rspec
jquery-rails
launchy
- rails!
+ rails
rspec-rails
sass-rails
sqlite3

0 comments on commit 2b51857

Please sign in to comment.