Skip to content

Commit f39415b

Browse files
committed
update to Rails 3.2.11
1 parent 5ed2850 commit f39415b

File tree

2 files changed

+48
-48
lines changed

2 files changed

+48
-48
lines changed

Gemfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.9'
2+
gem 'rails', '3.2.11'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
66
gem 'coffee-rails', '~> 3.2.1'
77
gem 'uglifier', '>= 1.0.3'
88
end
99
gem 'jquery-rails'
10-
gem "rspec-rails", ">= 2.11.4", :group => [:development, :test]
10+
gem "rspec-rails", ">= 2.12.1", :group => [:development, :test]
1111
gem "database_cleaner", ">= 0.9.1", :group => :test
1212
gem "email_spec", ">= 1.4.0", :group => :test
1313
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
1414
gem "launchy", ">= 2.1.2", :group => :test
15-
gem "capybara", ">= 1.1.4", :group => :test
15+
gem "capybara", ">= 2.0.2", :group => :test
1616
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
17-
gem "devise", ">= 2.1.2"
18-
gem "quiet_assets", ">= 1.0.1", :group => :development
17+
gem "devise", ">= 2.2.0"
18+
gem "quiet_assets", ">= 1.0.1", :group => :development

Gemfile.lock

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.9)
5-
actionpack (= 3.2.9)
4+
actionmailer (3.2.11)
5+
actionpack (= 3.2.11)
66
mail (~> 2.4.4)
7-
actionpack (3.2.9)
8-
activemodel (= 3.2.9)
9-
activesupport (= 3.2.9)
7+
actionpack (3.2.11)
8+
activemodel (= 3.2.11)
9+
activesupport (= 3.2.11)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.0)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.9)
18-
activesupport (= 3.2.9)
17+
activemodel (3.2.11)
18+
activesupport (= 3.2.11)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.9)
21-
activemodel (= 3.2.9)
22-
activesupport (= 3.2.9)
20+
activerecord (3.2.11)
21+
activemodel (= 3.2.11)
22+
activesupport (= 3.2.11)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.9)
26-
activemodel (= 3.2.9)
27-
activesupport (= 3.2.9)
28-
activesupport (3.2.9)
25+
activeresource (3.2.11)
26+
activemodel (= 3.2.11)
27+
activesupport (= 3.2.11)
28+
activesupport (3.2.11)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
3131
addressable (2.3.2)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
3434
builder (3.0.4)
35-
capybara (2.0.1)
35+
capybara (2.0.2)
3636
mime-types (>= 1.16)
3737
nokogiri (>= 1.3.3)
3838
rack (>= 1.0.0)
@@ -58,7 +58,7 @@ GEM
5858
cucumber (>= 1.1.8)
5959
nokogiri (>= 1.5.0)
6060
database_cleaner (0.9.1)
61-
devise (2.1.2)
61+
devise (2.2.0)
6262
bcrypt-ruby (~> 3.0)
6363
orm_adapter (~> 0.1)
6464
railties (~> 3.1)
@@ -75,7 +75,7 @@ GEM
7575
factory_girl_rails (4.1.0)
7676
factory_girl (~> 4.1.0)
7777
railties (>= 3.0.0)
78-
ffi (1.2.0)
78+
ffi (1.3.0)
7979
gherkin (2.11.5)
8080
json (>= 1.4.6)
8181
hike (1.2.1)
@@ -84,7 +84,7 @@ GEM
8484
jquery-rails (2.1.4)
8585
railties (>= 3.0, < 5.0)
8686
thor (>= 0.14, < 2.0)
87-
json (1.7.5)
87+
json (1.7.6)
8888
launchy (2.1.2)
8989
addressable (~> 2.3)
9090
libwebsocket (0.1.7.1)
@@ -95,55 +95,55 @@ GEM
9595
mime-types (~> 1.16)
9696
treetop (~> 1.4.8)
9797
mime-types (1.19)
98-
multi_json (1.4.0)
99-
nokogiri (1.5.5)
98+
multi_json (1.5.0)
99+
nokogiri (1.5.6)
100100
orm_adapter (0.4.0)
101101
polyglot (0.3.3)
102102
quiet_assets (1.0.1)
103103
railties (~> 3.1)
104-
rack (1.4.1)
104+
rack (1.4.3)
105105
rack-cache (1.2)
106106
rack (>= 0.4)
107107
rack-ssl (1.3.2)
108108
rack
109109
rack-test (0.6.2)
110110
rack (>= 1.0)
111-
rails (3.2.9)
112-
actionmailer (= 3.2.9)
113-
actionpack (= 3.2.9)
114-
activerecord (= 3.2.9)
115-
activeresource (= 3.2.9)
116-
activesupport (= 3.2.9)
111+
rails (3.2.11)
112+
actionmailer (= 3.2.11)
113+
actionpack (= 3.2.11)
114+
activerecord (= 3.2.11)
115+
activeresource (= 3.2.11)
116+
activesupport (= 3.2.11)
117117
bundler (~> 1.0)
118-
railties (= 3.2.9)
119-
railties (3.2.9)
120-
actionpack (= 3.2.9)
121-
activesupport (= 3.2.9)
118+
railties (= 3.2.11)
119+
railties (3.2.11)
120+
actionpack (= 3.2.11)
121+
activesupport (= 3.2.11)
122122
rack-ssl (~> 1.3.2)
123123
rake (>= 0.8.7)
124124
rdoc (~> 3.4)
125125
thor (>= 0.14.6, < 2.0)
126-
rake (10.0.2)
126+
rake (10.0.3)
127127
rdoc (3.12)
128128
json (~> 1.4)
129-
rspec-core (2.12.1)
130-
rspec-expectations (2.12.0)
129+
rspec-core (2.12.2)
130+
rspec-expectations (2.12.1)
131131
diff-lcs (~> 1.1.3)
132-
rspec-mocks (2.12.0)
133-
rspec-rails (2.12.0)
132+
rspec-mocks (2.12.1)
133+
rspec-rails (2.12.1)
134134
actionpack (>= 3.0)
135135
activesupport (>= 3.0)
136136
railties (>= 3.0)
137137
rspec-core (~> 2.12.0)
138138
rspec-expectations (~> 2.12.0)
139139
rspec-mocks (~> 2.12.0)
140140
rubyzip (0.9.9)
141-
sass (3.2.3)
141+
sass (3.2.5)
142142
sass-rails (3.2.5)
143143
railties (~> 3.2.0)
144144
sass (>= 3.1.10)
145145
tilt (~> 1.3)
146-
selenium-webdriver (2.27.1)
146+
selenium-webdriver (2.27.2)
147147
childprocess (>= 0.2.5)
148148
libwebsocket (~> 0.1.3)
149149
multi_json (~> 1.0)
@@ -165,26 +165,26 @@ GEM
165165
multi_json (~> 1.0, >= 1.0.2)
166166
warden (1.2.1)
167167
rack (>= 1.0)
168-
websocket (1.0.4)
168+
websocket (1.0.6)
169169
xpath (1.0.0)
170170
nokogiri (~> 1.3)
171171

172172
PLATFORMS
173173
ruby
174174

175175
DEPENDENCIES
176-
capybara (>= 1.1.4)
176+
capybara (>= 2.0.2)
177177
coffee-rails (~> 3.2.1)
178178
cucumber-rails (>= 1.3.0)
179179
database_cleaner (>= 0.9.1)
180-
devise (>= 2.1.2)
180+
devise (>= 2.2.0)
181181
email_spec (>= 1.4.0)
182182
factory_girl_rails (>= 4.1.0)
183183
jquery-rails
184184
launchy (>= 2.1.2)
185185
quiet_assets (>= 1.0.1)
186-
rails (= 3.2.9)
187-
rspec-rails (>= 2.11.4)
186+
rails (= 3.2.11)
187+
rspec-rails (>= 2.12.1)
188188
sass-rails (~> 3.2.3)
189189
sqlite3
190190
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)