Commit a237c802dadb4e16a665117f3f2c07c4d1d68c1b
1 parent
5867a5c2
Exists in
master
and in
4 other branches
Rails version to 3.2.8
Showing
2 changed files
with
31 additions
and
31 deletions
Show diff stats
Gemfile
Gemfile.lock
@@ -69,31 +69,31 @@ GEM | @@ -69,31 +69,31 @@ GEM | ||
69 | remote: http://rubygems.org/ | 69 | remote: http://rubygems.org/ |
70 | specs: | 70 | specs: |
71 | ZenTest (4.8.1) | 71 | ZenTest (4.8.1) |
72 | - actionmailer (3.2.5) | ||
73 | - actionpack (= 3.2.5) | 72 | + actionmailer (3.2.8) |
73 | + actionpack (= 3.2.8) | ||
74 | mail (~> 2.4.4) | 74 | mail (~> 2.4.4) |
75 | - actionpack (3.2.5) | ||
76 | - activemodel (= 3.2.5) | ||
77 | - activesupport (= 3.2.5) | 75 | + actionpack (3.2.8) |
76 | + activemodel (= 3.2.8) | ||
77 | + activesupport (= 3.2.8) | ||
78 | builder (~> 3.0.0) | 78 | builder (~> 3.0.0) |
79 | erubis (~> 2.7.0) | 79 | erubis (~> 2.7.0) |
80 | - journey (~> 1.0.1) | 80 | + journey (~> 1.0.4) |
81 | rack (~> 1.4.0) | 81 | rack (~> 1.4.0) |
82 | rack-cache (~> 1.2) | 82 | rack-cache (~> 1.2) |
83 | rack-test (~> 0.6.1) | 83 | rack-test (~> 0.6.1) |
84 | sprockets (~> 2.1.3) | 84 | sprockets (~> 2.1.3) |
85 | - activemodel (3.2.5) | ||
86 | - activesupport (= 3.2.5) | 85 | + activemodel (3.2.8) |
86 | + activesupport (= 3.2.8) | ||
87 | builder (~> 3.0.0) | 87 | builder (~> 3.0.0) |
88 | - activerecord (3.2.5) | ||
89 | - activemodel (= 3.2.5) | ||
90 | - activesupport (= 3.2.5) | 88 | + activerecord (3.2.8) |
89 | + activemodel (= 3.2.8) | ||
90 | + activesupport (= 3.2.8) | ||
91 | arel (~> 3.0.2) | 91 | arel (~> 3.0.2) |
92 | tzinfo (~> 0.3.29) | 92 | tzinfo (~> 0.3.29) |
93 | - activeresource (3.2.5) | ||
94 | - activemodel (= 3.2.5) | ||
95 | - activesupport (= 3.2.5) | ||
96 | - activesupport (3.2.5) | 93 | + activeresource (3.2.8) |
94 | + activemodel (= 3.2.8) | ||
95 | + activesupport (= 3.2.8) | ||
96 | + activesupport (3.2.8) | ||
97 | i18n (~> 0.6) | 97 | i18n (~> 0.6) |
98 | multi_json (~> 1.0) | 98 | multi_json (~> 1.0) |
99 | acts-as-taggable-on (2.3.1) | 99 | acts-as-taggable-on (2.3.1) |
@@ -189,14 +189,14 @@ GEM | @@ -189,14 +189,14 @@ GEM | ||
189 | multi_json (~> 1.0) | 189 | multi_json (~> 1.0) |
190 | multi_xml | 190 | multi_xml |
191 | i18n (0.6.0) | 191 | i18n (0.6.0) |
192 | - journey (1.0.3) | 192 | + journey (1.0.4) |
193 | jquery-rails (2.0.2) | 193 | jquery-rails (2.0.2) |
194 | railties (>= 3.2.0, < 5.0) | 194 | railties (>= 3.2.0, < 5.0) |
195 | thor (~> 0.14) | 195 | thor (~> 0.14) |
196 | jquery-ui-rails (0.5.0) | 196 | jquery-ui-rails (0.5.0) |
197 | jquery-rails | 197 | jquery-rails |
198 | railties (>= 3.1.0) | 198 | railties (>= 3.1.0) |
199 | - json (1.7.3) | 199 | + json (1.7.4) |
200 | kaminari (0.13.0) | 200 | kaminari (0.13.0) |
201 | actionpack (>= 3.0.0) | 201 | actionpack (>= 3.0.0) |
202 | activesupport (>= 3.0.0) | 202 | activesupport (>= 3.0.0) |
@@ -214,7 +214,7 @@ GEM | @@ -214,7 +214,7 @@ GEM | ||
214 | mime-types (~> 1.16) | 214 | mime-types (~> 1.16) |
215 | treetop (~> 1.4.8) | 215 | treetop (~> 1.4.8) |
216 | method_source (0.7.1) | 216 | method_source (0.7.1) |
217 | - mime-types (1.18) | 217 | + mime-types (1.19) |
218 | minitest (3.1.0) | 218 | minitest (3.1.0) |
219 | modernizr (2.5.3) | 219 | modernizr (2.5.3) |
220 | sprockets (~> 2.0) | 220 | sprockets (~> 2.0) |
@@ -247,19 +247,19 @@ GEM | @@ -247,19 +247,19 @@ GEM | ||
247 | rack | 247 | rack |
248 | rack-test (0.6.1) | 248 | rack-test (0.6.1) |
249 | rack (>= 1.0) | 249 | rack (>= 1.0) |
250 | - rails (3.2.5) | ||
251 | - actionmailer (= 3.2.5) | ||
252 | - actionpack (= 3.2.5) | ||
253 | - activerecord (= 3.2.5) | ||
254 | - activeresource (= 3.2.5) | ||
255 | - activesupport (= 3.2.5) | 250 | + rails (3.2.8) |
251 | + actionmailer (= 3.2.8) | ||
252 | + actionpack (= 3.2.8) | ||
253 | + activerecord (= 3.2.8) | ||
254 | + activeresource (= 3.2.8) | ||
255 | + activesupport (= 3.2.8) | ||
256 | bundler (~> 1.0) | 256 | bundler (~> 1.0) |
257 | - railties (= 3.2.5) | 257 | + railties (= 3.2.8) |
258 | rails-footnotes (3.7.8) | 258 | rails-footnotes (3.7.8) |
259 | rails (>= 3.0.0) | 259 | rails (>= 3.0.0) |
260 | - railties (3.2.5) | ||
261 | - actionpack (= 3.2.5) | ||
262 | - activesupport (= 3.2.5) | 260 | + railties (3.2.8) |
261 | + actionpack (= 3.2.8) | ||
262 | + activesupport (= 3.2.8) | ||
263 | rack-ssl (~> 1.3.2) | 263 | rack-ssl (~> 1.3.2) |
264 | rake (>= 0.8.7) | 264 | rake (>= 0.8.7) |
265 | rdoc (~> 3.4) | 265 | rdoc (~> 3.4) |
@@ -342,7 +342,7 @@ GEM | @@ -342,7 +342,7 @@ GEM | ||
342 | daemons (>= 1.0.9) | 342 | daemons (>= 1.0.9) |
343 | eventmachine (>= 0.12.6) | 343 | eventmachine (>= 0.12.6) |
344 | rack (>= 1.0.0) | 344 | rack (>= 1.0.0) |
345 | - thor (0.15.2) | 345 | + thor (0.15.4) |
346 | tilt (1.3.3) | 346 | tilt (1.3.3) |
347 | treetop (1.4.10) | 347 | treetop (1.4.10) |
348 | polyglot | 348 | polyglot |
@@ -411,7 +411,7 @@ DEPENDENCIES | @@ -411,7 +411,7 @@ DEPENDENCIES | ||
411 | pry | 411 | pry |
412 | pygments.rb! | 412 | pygments.rb! |
413 | rack-mini-profiler | 413 | rack-mini-profiler |
414 | - rails (= 3.2.5) | 414 | + rails (= 3.2.8) |
415 | rails-footnotes | 415 | rails-footnotes |
416 | raphael-rails (= 1.5.2) | 416 | raphael-rails (= 1.5.2) |
417 | redcarpet (~> 2.1.1) | 417 | redcarpet (~> 2.1.1) |