Skip to content

Commit 7596189

Browse files
committed
Update rails dependency.
1 parent 350d782 commit 7596189

File tree

2 files changed

+53
-59
lines changed

2 files changed

+53
-59
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
source :rubygems
22

3-
gem 'rails', :git => 'git://github.com/rails/rails.git', :branch => '3-1-0'
3+
gem 'rails', '3.2.0.rc1'
44
gem 'mocha'

Gemfile.lock

Lines changed: 52 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,89 @@
1-
GIT
2-
remote: git://github.com/rails/rails.git
3-
revision: 505e84599aff6abf719484636b0515e1ce2e2220
4-
branch: 3-1-0
1+
GEM
2+
remote: http://rubygems.org/
53
specs:
6-
actionmailer (3.1.0)
7-
actionpack (= 3.1.0)
4+
actionmailer (3.2.0.rc1)
5+
actionpack (= 3.2.0.rc1)
86
mail (~> 2.3.0)
9-
actionpack (3.1.0)
10-
activemodel (= 3.1.0)
11-
activesupport (= 3.1.0)
7+
actionpack (3.2.0.rc1)
8+
activemodel (= 3.2.0.rc1)
9+
activesupport (= 3.2.0.rc1)
1210
builder (~> 3.0.0)
1311
erubis (~> 2.7.0)
1412
i18n (~> 0.6)
15-
rack (~> 1.3.2)
16-
rack-cache (~> 1.0.3)
17-
rack-mount (~> 0.8.2)
13+
journey (~> 1.0.0.rc1)
14+
rack (~> 1.3.5)
15+
rack-cache (~> 1.1)
1816
rack-test (~> 0.6.1)
19-
sprockets (~> 2.0.0)
20-
activemodel (3.1.0)
21-
activesupport (= 3.1.0)
22-
bcrypt-ruby (~> 3.0.0)
17+
sprockets (~> 2.1.2)
18+
activemodel (3.2.0.rc1)
19+
activesupport (= 3.2.0.rc1)
2320
builder (~> 3.0.0)
2421
i18n (~> 0.6)
25-
activerecord (3.1.0)
26-
activemodel (= 3.1.0)
27-
activesupport (= 3.1.0)
28-
arel (~> 2.2.1)
22+
activerecord (3.2.0.rc1)
23+
activemodel (= 3.2.0.rc1)
24+
activesupport (= 3.2.0.rc1)
25+
arel (~> 3.0.0.rc1)
2926
tzinfo (~> 0.3.29)
30-
activeresource (3.1.0)
31-
activemodel (= 3.1.0)
32-
activesupport (= 3.1.0)
33-
activesupport (3.1.0)
27+
activeresource (3.2.0.rc1)
28+
activemodel (= 3.2.0.rc1)
29+
activesupport (= 3.2.0.rc1)
30+
activesupport (3.2.0.rc1)
31+
i18n (~> 0.6)
3432
multi_json (~> 1.0)
35-
rails (3.1.0)
36-
actionmailer (= 3.1.0)
37-
actionpack (= 3.1.0)
38-
activerecord (= 3.1.0)
39-
activeresource (= 3.1.0)
40-
activesupport (= 3.1.0)
41-
bundler (~> 1.0)
42-
railties (= 3.1.0)
43-
railties (3.1.0)
44-
actionpack (= 3.1.0)
45-
activesupport (= 3.1.0)
46-
rack-ssl (~> 1.3.2)
47-
rake (>= 0.8.7)
48-
rdoc (~> 3.4)
49-
thor (~> 0.14.6)
50-
51-
GEM
52-
remote: http://rubygems.org/
53-
specs:
54-
arel (2.2.1)
55-
bcrypt-ruby (3.0.0)
33+
arel (3.0.0.rc1)
5634
builder (3.0.0)
5735
erubis (2.7.0)
5836
hike (1.2.1)
5937
i18n (0.6.0)
38+
journey (1.0.0.rc1)
39+
json (1.6.3)
6040
mail (2.3.0)
6141
i18n (>= 0.4.0)
6242
mime-types (~> 1.16)
6343
treetop (~> 1.4.8)
64-
mime-types (1.16)
44+
mime-types (1.17.2)
6545
mocha (0.9.12)
66-
multi_json (1.0.3)
67-
polyglot (0.3.2)
68-
rack (1.3.2)
69-
rack-cache (1.0.3)
46+
multi_json (1.0.4)
47+
polyglot (0.3.3)
48+
rack (1.3.5)
49+
rack-cache (1.1)
7050
rack (>= 0.4)
71-
rack-mount (0.8.3)
72-
rack (>= 1.0.0)
7351
rack-ssl (1.3.2)
7452
rack
7553
rack-test (0.6.1)
7654
rack (>= 1.0)
77-
rake (0.9.2)
78-
rdoc (3.9.4)
79-
sprockets (2.0.0)
55+
rails (3.2.0.rc1)
56+
actionmailer (= 3.2.0.rc1)
57+
actionpack (= 3.2.0.rc1)
58+
activerecord (= 3.2.0.rc1)
59+
activeresource (= 3.2.0.rc1)
60+
activesupport (= 3.2.0.rc1)
61+
bundler (~> 1.0)
62+
railties (= 3.2.0.rc1)
63+
railties (3.2.0.rc1)
64+
actionpack (= 3.2.0.rc1)
65+
activesupport (= 3.2.0.rc1)
66+
rack-ssl (~> 1.3.2)
67+
rake (>= 0.8.7)
68+
rdoc (~> 3.4)
69+
thor (~> 0.14.6)
70+
rake (0.9.2.2)
71+
rdoc (3.12)
72+
json (~> 1.4)
73+
sprockets (2.1.2)
8074
hike (~> 1.2)
8175
rack (~> 1.0)
82-
tilt (!= 1.3.0, ~> 1.1)
76+
tilt (~> 1.1, != 1.3.0)
8377
thor (0.14.6)
8478
tilt (1.3.3)
8579
treetop (1.4.10)
8680
polyglot
8781
polyglot (>= 0.3.1)
88-
tzinfo (0.3.29)
82+
tzinfo (0.3.31)
8983

9084
PLATFORMS
9185
ruby
9286

9387
DEPENDENCIES
9488
mocha
95-
rails!
89+
rails (= 3.2.0.rc1)

0 commit comments

Comments
 (0)