Skip to content

Commit 056d148

Browse files
committed
upgrade to Rails 3.2.13
1 parent 11b984b commit 056d148

File tree

3 files changed

+49
-49
lines changed

3 files changed

+49
-49
lines changed

.rvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
77
# Only full ruby name is supported here, for short names use:
88
# echo "rvm use 1.9.3" > .rvmrc
9-
environment_id="ruby-1.9.3@rails3-devise-rspec-cucumber"
9+
environment_id="ruby-2.0.0@rails3-devise-rspec-cucumber"
1010

1111
# Uncomment the following lines if you want to verify rvm version per project
1212
# rvmrc_rvm_version="1.18.6 (latest)" # 1.10.1 seams as a safe start

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
2-
gem 'rails', '3.2.12'
2+
gem 'rails', '3.2.13.rc1'
33
gem 'sqlite3'
44
group :assets do
55
gem 'sass-rails', '~> 3.2.3'
@@ -18,4 +18,4 @@ gem "devise", ">= 2.2.3"
1818
gem "quiet_assets", ">= 1.0.1", :group => :development
1919
gem "figaro", ">= 0.5.3"
2020
gem "better_errors", ">= 0.6.0", :group => :development
21-
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]
21+
gem "binding_of_caller", ">= 0.7.1", :group => :development, :platforms => [:mri_19, :rbx]

Gemfile.lock

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.12)
5-
actionpack (= 3.2.12)
6-
mail (~> 2.4.4)
7-
actionpack (3.2.12)
8-
activemodel (= 3.2.12)
9-
activesupport (= 3.2.12)
4+
actionmailer (3.2.13.rc1)
5+
actionpack (= 3.2.13.rc1)
6+
mail (~> 2.5.3)
7+
actionpack (3.2.13.rc1)
8+
activemodel (= 3.2.13.rc1)
9+
activesupport (= 3.2.13.rc1)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
1313
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activemodel (3.2.12)
18-
activesupport (= 3.2.12)
17+
activemodel (3.2.13.rc1)
18+
activesupport (= 3.2.13.rc1)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.12)
21-
activemodel (= 3.2.12)
22-
activesupport (= 3.2.12)
20+
activerecord (3.2.13.rc1)
21+
activemodel (= 3.2.13.rc1)
22+
activesupport (= 3.2.13.rc1)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.12)
26-
activemodel (= 3.2.12)
27-
activesupport (= 3.2.12)
28-
activesupport (3.2.12)
29-
i18n (~> 0.6)
25+
activeresource (3.2.13.rc1)
26+
activemodel (= 3.2.13.rc1)
27+
activesupport (= 3.2.13.rc1)
28+
activesupport (3.2.13.rc1)
29+
i18n (= 0.6.1)
3030
multi_json (~> 1.0)
3131
addressable (2.3.3)
3232
arel (3.0.2)
3333
bcrypt-ruby (3.0.1)
34-
better_errors (0.6.0)
34+
better_errors (0.7.0)
3535
coderay (>= 1.0.0)
3636
erubis (>= 2.6.6)
3737
binding_of_caller (0.7.1)
@@ -53,7 +53,7 @@ GEM
5353
coffee-script (2.2.0)
5454
coffee-script-source
5555
execjs
56-
coffee-script-source (1.4.0)
56+
coffee-script-source (1.5.0)
5757
cucumber (1.2.1)
5858
builder (>= 2.1.2)
5959
diff-lcs (>= 1.1.3)
@@ -70,7 +70,7 @@ GEM
7070
orm_adapter (~> 0.1)
7171
railties (~> 3.1)
7272
warden (~> 1.2.1)
73-
diff-lcs (1.1.3)
73+
diff-lcs (1.2.1)
7474
email_spec (1.4.0)
7575
launchy (~> 2.1)
7676
mail (~> 2.2)
@@ -83,8 +83,8 @@ GEM
8383
factory_girl (~> 4.2.0)
8484
railties (>= 3.0.0)
8585
ffi (1.4.0)
86-
figaro (0.5.3)
87-
rails (~> 3.0)
86+
figaro (0.6.1)
87+
rails (>= 3, < 5)
8888
gherkin (2.11.6)
8989
json (>= 1.7.6)
9090
hike (1.2.1)
@@ -96,7 +96,7 @@ GEM
9696
json (1.7.7)
9797
launchy (2.2.0)
9898
addressable (~> 2.3)
99-
mail (2.4.4)
99+
mail (2.5.3)
100100
i18n (>= 0.4.0)
101101
mime-types (~> 1.16)
102102
treetop (~> 1.4.8)
@@ -105,46 +105,46 @@ GEM
105105
nokogiri (1.5.6)
106106
orm_adapter (0.4.0)
107107
polyglot (0.3.3)
108-
quiet_assets (1.0.1)
109-
railties (~> 3.1)
108+
quiet_assets (1.0.2)
109+
railties (>= 3.1, < 5.0)
110110
rack (1.4.5)
111111
rack-cache (1.2)
112112
rack (>= 0.4)
113113
rack-ssl (1.3.3)
114114
rack
115115
rack-test (0.6.2)
116116
rack (>= 1.0)
117-
rails (3.2.12)
118-
actionmailer (= 3.2.12)
119-
actionpack (= 3.2.12)
120-
activerecord (= 3.2.12)
121-
activeresource (= 3.2.12)
122-
activesupport (= 3.2.12)
117+
rails (3.2.13.rc1)
118+
actionmailer (= 3.2.13.rc1)
119+
actionpack (= 3.2.13.rc1)
120+
activerecord (= 3.2.13.rc1)
121+
activeresource (= 3.2.13.rc1)
122+
activesupport (= 3.2.13.rc1)
123123
bundler (~> 1.0)
124-
railties (= 3.2.12)
125-
railties (3.2.12)
126-
actionpack (= 3.2.12)
127-
activesupport (= 3.2.12)
124+
railties (= 3.2.13.rc1)
125+
railties (3.2.13.rc1)
126+
actionpack (= 3.2.13.rc1)
127+
activesupport (= 3.2.13.rc1)
128128
rack-ssl (~> 1.3.2)
129129
rake (>= 0.8.7)
130130
rdoc (~> 3.4)
131131
thor (>= 0.14.6, < 2.0)
132132
rake (10.0.3)
133-
rdoc (3.12.1)
133+
rdoc (3.12.2)
134134
json (~> 1.4)
135-
rspec-core (2.12.2)
136-
rspec-expectations (2.12.1)
137-
diff-lcs (~> 1.1.3)
138-
rspec-mocks (2.12.2)
139-
rspec-rails (2.12.2)
135+
rspec-core (2.13.0)
136+
rspec-expectations (2.13.0)
137+
diff-lcs (>= 1.1.3, < 2.0)
138+
rspec-mocks (2.13.0)
139+
rspec-rails (2.13.0)
140140
actionpack (>= 3.0)
141141
activesupport (>= 3.0)
142142
railties (>= 3.0)
143-
rspec-core (~> 2.12.0)
144-
rspec-expectations (~> 2.12.0)
145-
rspec-mocks (~> 2.12.0)
143+
rspec-core (~> 2.13.0)
144+
rspec-expectations (~> 2.13.0)
145+
rspec-mocks (~> 2.13.0)
146146
rubyzip (0.9.9)
147-
sass (3.2.5)
147+
sass (3.2.6)
148148
sass-rails (3.2.6)
149149
railties (~> 3.2.0)
150150
sass (>= 3.1.10)
@@ -161,7 +161,7 @@ GEM
161161
tilt (~> 1.1, != 1.3.0)
162162
sqlite3 (1.3.7)
163163
thor (0.17.0)
164-
tilt (1.3.3)
164+
tilt (1.3.4)
165165
treetop (1.4.12)
166166
polyglot
167167
polyglot (>= 0.3.1)
@@ -192,7 +192,7 @@ DEPENDENCIES
192192
jquery-rails
193193
launchy (>= 2.2.0)
194194
quiet_assets (>= 1.0.1)
195-
rails (= 3.2.12)
195+
rails (= 3.2.13.rc1)
196196
rspec-rails (>= 2.12.2)
197197
sass-rails (~> 3.2.3)
198198
sqlite3

0 commit comments

Comments
 (0)