Skip to content

Commit ec494ba

Browse files
committed
Upgraded Rails.
1 parent a22171a commit ec494ba

File tree

2 files changed

+34
-33
lines changed

2 files changed

+34
-33
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '3.2.8'
3+
gem 'rails', '~> 3.2'
44
gem 'sqlite3'
55
gem 'jquery-rails'
66
gem 'grape'

Gemfile.lock

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.8)
5-
actionpack (= 3.2.8)
4+
actionmailer (3.2.12)
5+
actionpack (= 3.2.12)
66
mail (~> 2.4.4)
7-
actionpack (3.2.8)
8-
activemodel (= 3.2.8)
9-
activesupport (= 3.2.8)
7+
actionpack (3.2.12)
8+
activemodel (= 3.2.12)
9+
activesupport (= 3.2.12)
1010
builder (~> 3.0.0)
1111
erubis (~> 2.7.0)
1212
journey (~> 1.0.4)
13-
rack (~> 1.4.0)
13+
rack (~> 1.4.5)
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
16-
sprockets (~> 2.1.3)
17-
activemodel (3.2.8)
18-
activesupport (= 3.2.8)
16+
sprockets (~> 2.2.1)
17+
activemodel (3.2.12)
18+
activesupport (= 3.2.12)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.8)
21-
activemodel (= 3.2.8)
22-
activesupport (= 3.2.8)
20+
activerecord (3.2.12)
21+
activemodel (= 3.2.12)
22+
activesupport (= 3.2.12)
2323
arel (~> 3.0.2)
2424
tzinfo (~> 0.3.29)
25-
activeresource (3.2.8)
26-
activemodel (= 3.2.8)
27-
activesupport (= 3.2.8)
28-
activesupport (3.2.8)
25+
activeresource (3.2.12)
26+
activemodel (= 3.2.12)
27+
activesupport (= 3.2.12)
28+
activesupport (3.2.12)
2929
i18n (~> 0.6)
3030
multi_json (~> 1.0)
3131
arel (3.0.2)
@@ -38,8 +38,8 @@ GEM
3838
rack-test (>= 0.5.4)
3939
selenium-webdriver (~> 2.0)
4040
xpath (~> 1.0.0)
41-
childprocess (0.3.7)
42-
ffi (~> 1.0, >= 1.0.6)
41+
childprocess (0.3.8)
42+
ffi (~> 1.0, >= 1.0.11)
4343
coffee-rails (3.2.2)
4444
coffee-script (>= 2.2.0)
4545
railties (~> 3.2.0)
@@ -70,13 +70,13 @@ GEM
7070
jquery-rails (2.2.1)
7171
railties (>= 3.0, < 5.0)
7272
thor (>= 0.14, < 2.0)
73-
json (1.7.6)
73+
json (1.7.7)
7474
mail (2.4.4)
7575
i18n (>= 0.4.0)
7676
mime-types (~> 1.16)
7777
treetop (~> 1.4.8)
7878
mime-types (1.21)
79-
multi_json (1.5.0)
79+
multi_json (1.6.0)
8080
multi_xml (0.5.3)
8181
nokogiri (1.5.6)
8282
polyglot (0.3.3)
@@ -91,17 +91,17 @@ GEM
9191
rack
9292
rack-test (0.6.2)
9393
rack (>= 1.0)
94-
rails (3.2.8)
95-
actionmailer (= 3.2.8)
96-
actionpack (= 3.2.8)
97-
activerecord (= 3.2.8)
98-
activeresource (= 3.2.8)
99-
activesupport (= 3.2.8)
94+
rails (3.2.12)
95+
actionmailer (= 3.2.12)
96+
actionpack (= 3.2.12)
97+
activerecord (= 3.2.12)
98+
activeresource (= 3.2.12)
99+
activesupport (= 3.2.12)
100100
bundler (~> 1.0)
101-
railties (= 3.2.8)
102-
railties (3.2.8)
103-
actionpack (= 3.2.8)
104-
activesupport (= 3.2.8)
101+
railties (= 3.2.12)
102+
railties (3.2.12)
103+
actionpack (= 3.2.12)
104+
activesupport (= 3.2.12)
105105
rack-ssl (~> 1.3.2)
106106
rake (>= 0.8.7)
107107
rdoc (~> 3.4)
@@ -135,8 +135,9 @@ GEM
135135
multi_json (~> 1.0)
136136
rubyzip
137137
websocket (~> 1.0.4)
138-
sprockets (2.1.3)
138+
sprockets (2.2.2)
139139
hike (~> 1.2)
140+
multi_json (~> 1.0)
140141
rack (~> 1.0)
141142
tilt (~> 1.1, != 1.3.0)
142143
sqlite3 (1.3.7)
@@ -164,7 +165,7 @@ DEPENDENCIES
164165
coffee-rails (~> 3.2.1)
165166
grape
166167
jquery-rails
167-
rails (= 3.2.8)
168+
rails (~> 3.2)
168169
rspec
169170
rspec-rails
170171
sass-rails (~> 3.2.3)

0 commit comments

Comments
 (0)