Skip to content

Commit 4eea144

Browse files
committed
update for Rails 3.1.2
1 parent ca74668 commit 4eea144

File tree

1 file changed

+52
-53
lines changed

1 file changed

+52
-53
lines changed

Gemfile.lock

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
actionmailer (3.1.1)
5-
actionpack (= 3.1.1)
4+
actionmailer (3.1.2)
5+
actionpack (= 3.1.2)
66
mail (~> 2.3.0)
7-
actionpack (3.1.1)
8-
activemodel (= 3.1.1)
9-
activesupport (= 3.1.1)
7+
actionpack (3.1.2)
8+
activemodel (= 3.1.2)
9+
activesupport (= 3.1.2)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
i18n (~> 0.6)
13-
rack (~> 1.3.2)
13+
rack (~> 1.3.5)
1414
rack-cache (~> 1.1)
1515
rack-mount (~> 0.8.2)
1616
rack-test (~> 0.6.1)
17-
sprockets (~> 2.0.2)
18-
activemodel (3.1.1)
19-
activesupport (= 3.1.1)
17+
sprockets (~> 2.1.0)
18+
activemodel (3.1.2)
19+
activesupport (= 3.1.2)
2020
builder (~> 3.0.0)
2121
i18n (~> 0.6)
22-
activerecord (3.1.1)
23-
activemodel (= 3.1.1)
24-
activesupport (= 3.1.1)
22+
activerecord (3.1.2)
23+
activemodel (= 3.1.2)
24+
activesupport (= 3.1.2)
2525
arel (~> 2.2.1)
2626
tzinfo (~> 0.3.29)
27-
activeresource (3.1.1)
28-
activemodel (= 3.1.1)
29-
activesupport (= 3.1.1)
30-
activesupport (3.1.1)
27+
activeresource (3.1.2)
28+
activemodel (= 3.1.2)
29+
activesupport (= 3.1.2)
30+
activesupport (3.1.2)
3131
multi_json (~> 1.0)
3232
addressable (2.2.6)
3333
arel (2.2.1)
@@ -68,17 +68,17 @@ GEM
6868
erubis (2.7.0)
6969
execjs (1.2.9)
7070
multi_json (~> 1.0)
71-
factory_girl (2.2.0)
71+
factory_girl (2.3.0)
7272
activesupport
73-
factory_girl_rails (1.3.0)
74-
factory_girl (~> 2.2.0)
73+
factory_girl_rails (1.4.0)
74+
factory_girl (~> 2.3.0)
7575
railties (>= 3.0.0)
7676
ffi (1.0.11)
7777
gherkin (2.6.5)
7878
json (>= 1.4.6)
7979
hike (1.2.1)
8080
i18n (0.6.0)
81-
jquery-rails (1.0.17)
81+
jquery-rails (1.0.18)
8282
railties (~> 3.0)
8383
thor (~> 0.14)
8484
json (1.6.1)
@@ -103,51 +103,50 @@ GEM
103103
rack
104104
rack-test (0.6.1)
105105
rack (>= 1.0)
106-
rails (3.1.1)
107-
actionmailer (= 3.1.1)
108-
actionpack (= 3.1.1)
109-
activerecord (= 3.1.1)
110-
activeresource (= 3.1.1)
111-
activesupport (= 3.1.1)
106+
rails (3.1.2)
107+
actionmailer (= 3.1.2)
108+
actionpack (= 3.1.2)
109+
activerecord (= 3.1.2)
110+
activeresource (= 3.1.2)
111+
activesupport (= 3.1.2)
112112
bundler (~> 1.0)
113-
railties (= 3.1.1)
114-
railties (3.1.1)
115-
actionpack (= 3.1.1)
116-
activesupport (= 3.1.1)
113+
railties (= 3.1.2)
114+
railties (3.1.2)
115+
actionpack (= 3.1.2)
116+
activesupport (= 3.1.2)
117117
rack-ssl (~> 1.3.2)
118118
rake (>= 0.8.7)
119119
rdoc (~> 3.4)
120120
thor (~> 0.14.6)
121121
rake (0.9.2.2)
122122
rdoc (3.11)
123123
json (~> 1.4)
124-
rspec (2.7.0)
125-
rspec-core (~> 2.7.0)
126-
rspec-expectations (~> 2.7.0)
127-
rspec-mocks (~> 2.7.0)
128-
rspec-core (2.7.1)
129-
rspec-expectations (2.7.0)
124+
rspec (2.8.0.rc1)
125+
rspec-core (= 2.8.0.rc1)
126+
rspec-expectations (= 2.8.0.rc1)
127+
rspec-mocks (= 2.8.0.rc1)
128+
rspec-core (2.8.0.rc1)
129+
rspec-expectations (2.8.0.rc1)
130130
diff-lcs (~> 1.1.2)
131-
rspec-mocks (2.7.0)
132-
rspec-rails (2.7.0)
131+
rspec-mocks (2.8.0.rc1)
132+
rspec-rails (2.8.0.rc1)
133133
actionpack (~> 3.0)
134134
activesupport (~> 3.0)
135135
railties (~> 3.0)
136-
rspec (~> 2.7.0)
136+
rspec (= 2.8.0.rc1)
137137
rubyzip (0.9.4)
138138
sass (3.1.10)
139-
sass-rails (3.1.4)
139+
sass-rails (3.1.5)
140140
actionpack (~> 3.1.0)
141141
railties (~> 3.1.0)
142-
sass (>= 3.1.4)
143-
sprockets (~> 2.0.0)
142+
sass (~> 3.1.10)
144143
tilt (~> 1.3.2)
145-
selenium-webdriver (2.12.2)
144+
selenium-webdriver (2.13.0)
146145
childprocess (>= 0.2.1)
147146
ffi (~> 1.0.9)
148147
json_pure
149148
rubyzip
150-
sprockets (2.0.3)
149+
sprockets (2.1.1)
151150
hike (~> 1.2)
152151
rack (~> 1.0)
153152
tilt (~> 1.1, != 1.3.0)
@@ -159,7 +158,7 @@ GEM
159158
polyglot
160159
polyglot (>= 0.3.1)
161160
tzinfo (0.3.31)
162-
uglifier (1.0.4)
161+
uglifier (1.1.0)
163162
execjs (>= 0.3.0)
164163
multi_json (>= 1.0.2)
165164
warden (1.1.0)
@@ -171,16 +170,16 @@ PLATFORMS
171170
ruby
172171

173172
DEPENDENCIES
174-
capybara (>= 1.1.1)
173+
capybara (>= 1.1.2)
175174
coffee-rails (~> 3.1.1)
176-
cucumber-rails (>= 1.1.1)
177-
database_cleaner (>= 0.6.7)
178-
devise (>= 1.4.7)
179-
factory_girl_rails (>= 1.2.0)
175+
cucumber-rails (>= 1.2.0)
176+
database_cleaner (>= 0.7.0)
177+
devise (>= 1.5.0)
178+
factory_girl_rails (>= 1.4.0)
180179
jquery-rails
181180
launchy (>= 2.0.5)
182-
rails (= 3.1.1)
183-
rspec-rails (>= 2.6.1)
184-
sass-rails (~> 3.1.4)
181+
rails (= 3.1.2)
182+
rspec-rails (>= 2.8.0.rc1)
183+
sass-rails (~> 3.1.5.rc.2)
185184
sqlite3
186185
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)