Skip to content

Commit d38af03

Browse files
committed
update rails
1 parent 7cdc524 commit d38af03

File tree

2 files changed

+53
-37
lines changed

2 files changed

+53
-37
lines changed

Gemfile

+1-1
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.11'
44

55
# Bundle edge Rails instead:
66
# gem 'rails', :git => 'git://github.com/rails/rails.git'

Gemfile.lock

+52-36
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,114 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (3.2.8)
5-
actionpack (= 3.2.8)
4+
actionmailer (3.2.11)
5+
actionpack (= 3.2.11)
66
mail (~> 2.4.4)
7-
actionpack (3.2.8)
8-
activemodel (= 3.2.8)
9-
activesupport (= 3.2.8)
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)
16-
sprockets (~> 2.1.3)
17-
activemodel (3.2.8)
18-
activesupport (= 3.2.8)
16+
sprockets (~> 2.2.1)
17+
activemodel (3.2.11)
18+
activesupport (= 3.2.11)
1919
builder (~> 3.0.0)
20-
activerecord (3.2.8)
21-
activemodel (= 3.2.8)
22-
activesupport (= 3.2.8)
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.8)
26-
activemodel (= 3.2.8)
27-
activesupport (= 3.2.8)
28-
activesupport (3.2.8)
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
arel (3.0.2)
32-
builder (3.0.0)
32+
builder (3.0.4)
3333
coffee-rails (3.2.2)
3434
coffee-script (>= 2.2.0)
3535
railties (~> 3.2.0)
3636
coffee-script (2.2.0)
3737
coffee-script-source
3838
execjs
3939
coffee-script-source (1.3.3)
40+
daemons (1.1.9)
4041
erubis (2.7.0)
42+
eventmachine (1.0.0)
43+
eventmachine (1.0.0-x86-mingw32)
4144
execjs (1.4.0)
4245
multi_json (~> 1.0)
4346
hike (1.2.1)
44-
i18n (0.6.0)
47+
i18n (0.6.1)
4548
journey (1.0.4)
4649
jquery-rails (2.1.1)
4750
railties (>= 3.1.0, < 5.0)
4851
thor (~> 0.14)
49-
json (1.7.5)
52+
json (1.7.6)
53+
libv8 (3.11.8.13)
5054
mail (2.4.4)
5155
i18n (>= 0.4.0)
5256
mime-types (~> 1.16)
5357
treetop (~> 1.4.8)
5458
mime-types (1.19)
55-
multi_json (1.3.6)
59+
multi_json (1.5.0)
5660
pg (0.14.0)
5761
pg (0.14.0-x86-mingw32)
5862
polyglot (0.3.3)
59-
rack (1.4.1)
63+
rack (1.4.3)
6064
rack-cache (1.2)
6165
rack (>= 0.4)
6266
rack-ssl (1.3.2)
6367
rack
64-
rack-test (0.6.1)
68+
rack-test (0.6.2)
6569
rack (>= 1.0)
66-
rails (3.2.8)
67-
actionmailer (= 3.2.8)
68-
actionpack (= 3.2.8)
69-
activerecord (= 3.2.8)
70-
activeresource (= 3.2.8)
71-
activesupport (= 3.2.8)
70+
rails (3.2.11)
71+
actionmailer (= 3.2.11)
72+
actionpack (= 3.2.11)
73+
activerecord (= 3.2.11)
74+
activeresource (= 3.2.11)
75+
activesupport (= 3.2.11)
7276
bundler (~> 1.0)
73-
railties (= 3.2.8)
74-
railties (3.2.8)
75-
actionpack (= 3.2.8)
76-
activesupport (= 3.2.8)
77+
railties (= 3.2.11)
78+
railties (3.2.11)
79+
actionpack (= 3.2.11)
80+
activesupport (= 3.2.11)
7781
rack-ssl (~> 1.3.2)
7882
rake (>= 0.8.7)
7983
rdoc (~> 3.4)
8084
thor (>= 0.14.6, < 2.0)
81-
rake (0.9.2.2)
85+
rake (10.0.3)
8286
rdoc (3.12)
8387
json (~> 1.4)
88+
ref (1.0.2)
8489
sass (3.2.1)
8590
sass-rails (3.2.5)
8691
railties (~> 3.2.0)
8792
sass (>= 3.1.10)
8893
tilt (~> 1.3)
89-
sprockets (2.1.3)
94+
sprockets (2.2.2)
9095
hike (~> 1.2)
96+
multi_json (~> 1.0)
9197
rack (~> 1.0)
9298
tilt (~> 1.1, != 1.3.0)
99+
therubyracer (0.11.1)
100+
libv8 (~> 3.11.8.7)
101+
ref
102+
thin (1.5.0)
103+
daemons (>= 1.0.9)
104+
eventmachine (>= 0.12.6)
105+
rack (>= 1.0.0)
93106
thor (0.16.0)
94107
tilt (1.3.3)
95-
treetop (1.4.10)
108+
treetop (1.4.12)
96109
polyglot
97110
polyglot (>= 0.3.1)
98-
tzinfo (0.3.33)
111+
tzinfo (0.3.35)
99112
uglifier (1.2.7)
100113
execjs (>= 0.3.0)
101114
multi_json (~> 1.3)
@@ -106,8 +119,11 @@ PLATFORMS
106119

107120
DEPENDENCIES
108121
coffee-rails (~> 3.2.1)
122+
execjs
109123
jquery-rails
110124
pg
111-
rails (= 3.2.8)
125+
rails (= 3.2.11)
112126
sass-rails (~> 3.2.3)
127+
therubyracer
128+
thin
113129
uglifier (>= 1.0.3)

0 commit comments

Comments
 (0)