Download as
Browse Code »

Commit 433d2278e0a9228ba8142dfb6b69df900654158d

Authored by Dmitriy Zaporozhets
1 parent 578cf898
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Rails up to 3.2.9

Showing 2 changed files with 35 additions and 34 deletions   Show diff stats
Gemfile
  Diff comments   View file @433d227
... ... @@ -8,7 +8,7 @@ def linux_only(require_as)
8 8 RUBY_PLATFORM.include?('linux') && require_as
9 9 end
10 10  
11   -gem "rails", "3.2.8"
  11 +gem "rails", "3.2.9"
12 12  
13 13 # Supported DBs
14 14 gem "sqlite3", group: :sqlite
... ...
Gemfile.lock
  Diff comments   View file @433d227
... ... @@ -51,31 +51,31 @@ GIT
51 51 GEM
52 52 remote: http://rubygems.org/
53 53 specs:
54   - actionmailer (3.2.8)
55   - actionpack (= 3.2.8)
  54 + actionmailer (3.2.9)
  55 + actionpack (= 3.2.9)
56 56 mail (~> 2.4.4)
57   - actionpack (3.2.8)
58   - activemodel (= 3.2.8)
59   - activesupport (= 3.2.8)
  57 + actionpack (3.2.9)
  58 + activemodel (= 3.2.9)
  59 + activesupport (= 3.2.9)
60 60 builder (~> 3.0.0)
61 61 erubis (~> 2.7.0)
62 62 journey (~> 1.0.4)
63 63 rack (~> 1.4.0)
64 64 rack-cache (~> 1.2)
65 65 rack-test (~> 0.6.1)
66   - sprockets (~> 2.1.3)
67   - activemodel (3.2.8)
68   - activesupport (= 3.2.8)
  66 + sprockets (~> 2.2.1)
  67 + activemodel (3.2.9)
  68 + activesupport (= 3.2.9)
69 69 builder (~> 3.0.0)
70   - activerecord (3.2.8)
71   - activemodel (= 3.2.8)
72   - activesupport (= 3.2.8)
  70 + activerecord (3.2.9)
  71 + activemodel (= 3.2.9)
  72 + activesupport (= 3.2.9)
73 73 arel (~> 3.0.2)
74 74 tzinfo (~> 0.3.29)
75   - activeresource (3.2.8)
76   - activemodel (= 3.2.8)
77   - activesupport (= 3.2.8)
78   - activesupport (3.2.8)
  75 + activeresource (3.2.9)
  76 + activemodel (= 3.2.9)
  77 + activesupport (= 3.2.9)
  78 + activesupport (3.2.9)
79 79 i18n (~> 0.6)
80 80 multi_json (~> 1.0)
81 81 acts-as-taggable-on (2.3.1)
... ... @@ -86,7 +86,7 @@ GEM
86 86 bcrypt-ruby (3.0.1)
87 87 blankslate (2.1.2.4)
88 88 bootstrap-sass (2.0.4.0)
89   - builder (3.0.2)
  89 + builder (3.0.4)
90 90 capybara (1.1.2)
91 91 mime-types (>= 1.16)
92 92 nokogiri (>= 1.3.3)
... ... @@ -227,7 +227,7 @@ GEM
227 227 mime-types (1.19)
228 228 modernizr (2.5.3)
229 229 sprockets (~> 2.0)
230   - multi_json (1.3.6)
  230 + multi_json (1.3.7)
231 231 multi_xml (0.5.1)
232 232 multipart-post (1.1.5)
233 233 mysql2 (0.3.11)
... ... @@ -283,28 +283,28 @@ GEM
283 283 rack
284 284 rack-ssl (1.3.2)
285 285 rack
286   - rack-test (0.6.1)
  286 + rack-test (0.6.2)
287 287 rack (>= 1.0)
288   - rails (3.2.8)
289   - actionmailer (= 3.2.8)
290   - actionpack (= 3.2.8)
291   - activerecord (= 3.2.8)
292   - activeresource (= 3.2.8)
293   - activesupport (= 3.2.8)
  288 + rails (3.2.9)
  289 + actionmailer (= 3.2.9)
  290 + actionpack (= 3.2.9)
  291 + activerecord (= 3.2.9)
  292 + activeresource (= 3.2.9)
  293 + activesupport (= 3.2.9)
294 294 bundler (~> 1.0)
295   - railties (= 3.2.8)
  295 + railties (= 3.2.9)
296 296 rails-dev-tweaks (0.6.1)
297 297 actionpack (~> 3.1)
298 298 railties (~> 3.1)
299   - railties (3.2.8)
300   - actionpack (= 3.2.8)
301   - activesupport (= 3.2.8)
  299 + railties (3.2.9)
  300 + actionpack (= 3.2.9)
  301 + activesupport (= 3.2.9)
302 302 rack-ssl (~> 1.3.2)
303 303 rake (>= 0.8.7)
304 304 rdoc (~> 3.4)
305 305 thor (>= 0.14.6, < 2.0)
306 306 raindrops (0.9.0)
307   - rake (0.9.2.2)
  307 + rake (10.0.0)
308 308 raphael-rails (1.5.2)
309 309 rb-fsevent (0.9.1)
310 310 rb-inotify (0.8.8)
... ... @@ -375,8 +375,9 @@ GEM
375 375 capybara (~> 1)
376 376 railties (>= 3)
377 377 spinach (>= 0.4)
378   - sprockets (2.1.3)
  378 + sprockets (2.2.1)
379 379 hike (~> 1.2)
  380 + multi_json (~> 1.0)
380 381 rack (~> 1.0)
381 382 tilt (~> 1.1, != 1.3.0)
382 383 sqlite3 (1.3.6)
... ... @@ -390,10 +391,10 @@ GEM
390 391 rack (>= 1.0.0)
391 392 thor (0.16.0)
392 393 tilt (1.3.3)
393   - treetop (1.4.10)
  394 + treetop (1.4.12)
394 395 polyglot
395 396 polyglot (>= 0.3.1)
396   - tzinfo (0.3.33)
  397 + tzinfo (0.3.35)
397 398 uglifier (1.0.3)
398 399 execjs (>= 0.3.0)
399 400 multi_json (>= 1.0.2)
... ... @@ -468,7 +469,7 @@ DEPENDENCIES
468 469 pygments.rb (= 0.3.1)
469 470 quiet_assets (= 1.0.1)
470 471 rack-mini-profiler
471   - rails (= 3.2.8)
  472 + rails (= 3.2.9)
472 473 rails-dev-tweaks
473 474 raphael-rails (= 1.5.2)
474 475 rb-fsevent
... ...