Commit fb70eaa00ae842331a47c68fd7f43d2213e1258c
1 parent
9a671197
Exists in
master
and in
1 other branch
update rails to 3.2.8
Showing
2 changed files
with
31 additions
and
31 deletions
Show diff stats
Gemfile
Gemfile.lock
@@ -2,35 +2,35 @@ GEM | @@ -2,35 +2,35 @@ GEM | ||
2 | remote: http://rubygems.org/ | 2 | remote: http://rubygems.org/ |
3 | specs: | 3 | specs: |
4 | SystemTimer (1.2.3) | 4 | SystemTimer (1.2.3) |
5 | - actionmailer (3.2.6) | ||
6 | - actionpack (= 3.2.6) | 5 | + actionmailer (3.2.8) |
6 | + actionpack (= 3.2.8) | ||
7 | mail (~> 2.4.4) | 7 | mail (~> 2.4.4) |
8 | actionmailer_inline_css (1.3.1) | 8 | actionmailer_inline_css (1.3.1) |
9 | actionmailer (>= 3.0.0) | 9 | actionmailer (>= 3.0.0) |
10 | nokogiri (>= 1.4.4) | 10 | nokogiri (>= 1.4.4) |
11 | premailer (>= 1.7.1) | 11 | premailer (>= 1.7.1) |
12 | - actionpack (3.2.6) | ||
13 | - activemodel (= 3.2.6) | ||
14 | - activesupport (= 3.2.6) | 12 | + actionpack (3.2.8) |
13 | + activemodel (= 3.2.8) | ||
14 | + activesupport (= 3.2.8) | ||
15 | builder (~> 3.0.0) | 15 | builder (~> 3.0.0) |
16 | erubis (~> 2.7.0) | 16 | erubis (~> 2.7.0) |
17 | - journey (~> 1.0.1) | 17 | + journey (~> 1.0.4) |
18 | rack (~> 1.4.0) | 18 | rack (~> 1.4.0) |
19 | rack-cache (~> 1.2) | 19 | rack-cache (~> 1.2) |
20 | rack-test (~> 0.6.1) | 20 | rack-test (~> 0.6.1) |
21 | sprockets (~> 2.1.3) | 21 | sprockets (~> 2.1.3) |
22 | - activemodel (3.2.6) | ||
23 | - activesupport (= 3.2.6) | 22 | + activemodel (3.2.8) |
23 | + activesupport (= 3.2.8) | ||
24 | builder (~> 3.0.0) | 24 | builder (~> 3.0.0) |
25 | - activerecord (3.2.6) | ||
26 | - activemodel (= 3.2.6) | ||
27 | - activesupport (= 3.2.6) | 25 | + activerecord (3.2.8) |
26 | + activemodel (= 3.2.8) | ||
27 | + activesupport (= 3.2.8) | ||
28 | arel (~> 3.0.2) | 28 | arel (~> 3.0.2) |
29 | tzinfo (~> 0.3.29) | 29 | tzinfo (~> 0.3.29) |
30 | - activeresource (3.2.6) | ||
31 | - activemodel (= 3.2.6) | ||
32 | - activesupport (= 3.2.6) | ||
33 | - activesupport (3.2.6) | 30 | + activeresource (3.2.8) |
31 | + activemodel (= 3.2.8) | ||
32 | + activesupport (= 3.2.8) | ||
33 | + activesupport (3.2.8) | ||
34 | i18n (~> 0.6) | 34 | i18n (~> 0.6) |
35 | multi_json (~> 1.0) | 35 | multi_json (~> 1.0) |
36 | addressable (2.3.2) | 36 | addressable (2.3.2) |
@@ -39,7 +39,7 @@ GEM | @@ -39,7 +39,7 @@ GEM | ||
39 | bson (1.6.2) | 39 | bson (1.6.2) |
40 | bson_ext (1.6.2) | 40 | bson_ext (1.6.2) |
41 | bson (~> 1.6.2) | 41 | bson (~> 1.6.2) |
42 | - builder (3.0.0) | 42 | + builder (3.0.3) |
43 | capistrano (2.13.3) | 43 | capistrano (2.13.3) |
44 | highline | 44 | highline |
45 | net-scp (>= 1.0.0) | 45 | net-scp (>= 1.0.0) |
@@ -99,12 +99,12 @@ GEM | @@ -99,12 +99,12 @@ GEM | ||
99 | builder | 99 | builder |
100 | htmlentities (4.3.1) | 100 | htmlentities (4.3.1) |
101 | httpauth (0.1) | 101 | httpauth (0.1) |
102 | - i18n (0.6.0) | 102 | + i18n (0.6.1) |
103 | inherited_resources (1.3.1) | 103 | inherited_resources (1.3.1) |
104 | has_scope (~> 0.5.0) | 104 | has_scope (~> 0.5.0) |
105 | responders (~> 0.6) | 105 | responders (~> 0.6) |
106 | journey (1.0.4) | 106 | journey (1.0.4) |
107 | - json (1.7.4) | 107 | + json (1.7.5) |
108 | jwt (0.1.5) | 108 | jwt (0.1.5) |
109 | multi_json (>= 1.0) | 109 | multi_json (>= 1.0) |
110 | kaminari (0.13.0) | 110 | kaminari (0.13.0) |
@@ -195,19 +195,19 @@ GEM | @@ -195,19 +195,19 @@ GEM | ||
195 | rack-ssl-enforcer (0.2.4) | 195 | rack-ssl-enforcer (0.2.4) |
196 | rack-test (0.6.1) | 196 | rack-test (0.6.1) |
197 | rack (>= 1.0) | 197 | rack (>= 1.0) |
198 | - rails (3.2.6) | ||
199 | - actionmailer (= 3.2.6) | ||
200 | - actionpack (= 3.2.6) | ||
201 | - activerecord (= 3.2.6) | ||
202 | - activeresource (= 3.2.6) | ||
203 | - activesupport (= 3.2.6) | 198 | + rails (3.2.8) |
199 | + actionmailer (= 3.2.8) | ||
200 | + actionpack (= 3.2.8) | ||
201 | + activerecord (= 3.2.8) | ||
202 | + activeresource (= 3.2.8) | ||
203 | + activesupport (= 3.2.8) | ||
204 | bundler (~> 1.0) | 204 | bundler (~> 1.0) |
205 | - railties (= 3.2.6) | 205 | + railties (= 3.2.8) |
206 | rails_autolink (1.0.9) | 206 | rails_autolink (1.0.9) |
207 | rails (~> 3.1) | 207 | rails (~> 3.1) |
208 | - railties (3.2.6) | ||
209 | - actionpack (= 3.2.6) | ||
210 | - activesupport (= 3.2.6) | 208 | + railties (3.2.8) |
209 | + actionpack (= 3.2.8) | ||
210 | + activesupport (= 3.2.8) | ||
211 | rack-ssl (~> 1.3.2) | 211 | rack-ssl (~> 1.3.2) |
212 | rake (>= 0.8.7) | 212 | rake (>= 0.8.7) |
213 | rdoc (~> 3.4) | 213 | rdoc (~> 3.4) |
@@ -258,7 +258,7 @@ GEM | @@ -258,7 +258,7 @@ GEM | ||
258 | daemons (>= 1.0.9) | 258 | daemons (>= 1.0.9) |
259 | eventmachine (>= 0.12.6) | 259 | eventmachine (>= 0.12.6) |
260 | rack (>= 1.0.0) | 260 | rack (>= 1.0.0) |
261 | - thor (0.15.4) | 261 | + thor (0.16.0) |
262 | tilt (1.3.3) | 262 | tilt (1.3.3) |
263 | treetop (1.4.10) | 263 | treetop (1.4.10) |
264 | polyglot | 264 | polyglot |
@@ -314,7 +314,7 @@ DEPENDENCIES | @@ -314,7 +314,7 @@ DEPENDENCIES | ||
314 | oruen_redmine_client | 314 | oruen_redmine_client |
315 | pivotal-tracker | 315 | pivotal-tracker |
316 | rack-ssl-enforcer | 316 | rack-ssl-enforcer |
317 | - rails (= 3.2.6) | 317 | + rails (= 3.2.8) |
318 | rails_autolink (~> 1.0.9) | 318 | rails_autolink (~> 1.0.9) |
319 | ri_cal | 319 | ri_cal |
320 | rspec (~> 2.6) | 320 | rspec (~> 2.6) |