Download as
Browse Code »

Commit fb4f171587f4457488f9e3aa98e48467dde618ec

Authored by Dmitriy Zaporozhets
1 parent 8ec01e0b
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.13

Showing 2 changed files with 34 additions and 34 deletions   Show diff stats
@@ -8,7 +8,7 @@ def linux_only(require_as) @@ -8,7 +8,7 @@ def linux_only(require_as)
8 RUBY_PLATFORM.include?('linux') && require_as 8 RUBY_PLATFORM.include?('linux') && require_as
9 end 9 end
10 10
11 -gem "rails", "3.2.12" 11 +gem "rails", "3.2.13"
12 12
13 # Supported DBs 13 # Supported DBs
14 gem "mysql2", group: :mysql 14 gem "mysql2", group: :mysql
@@ -99,7 +99,7 @@ gem "colored" @@ -99,7 +99,7 @@ gem "colored"
99 # GitLab settings 99 # GitLab settings
100 gem 'settingslogic' 100 gem 'settingslogic'
101 101
102 -# Wiki 102 +# Wiki
103 # - Use latest master to resolve Gem dependency with Pygemnts 103 # - Use latest master to resolve Gem dependency with Pygemnts
104 # github-linquist needs pygments 0.4.2 but Gollum 2.4.11 104 # github-linquist needs pygments 0.4.2 but Gollum 2.4.11
105 # requires pygments 0.3.2. The latest master Gollum has been updated 105 # requires pygments 0.3.2. The latest master Gollum has been updated
@@ -32,12 +32,12 @@ GIT @@ -32,12 +32,12 @@ GIT
32 GEM 32 GEM
33 remote: https://rubygems.org/ 33 remote: https://rubygems.org/
34 specs: 34 specs:
35 - actionmailer (3.2.12)  
36 - actionpack (= 3.2.12)  
37 - mail (~> 2.4.4)  
38 - actionpack (3.2.12)  
39 - activemodel (= 3.2.12)  
40 - activesupport (= 3.2.12) 35 + actionmailer (3.2.13)
  36 + actionpack (= 3.2.13)
  37 + mail (~> 2.5.3)
  38 + actionpack (3.2.13)
  39 + activemodel (= 3.2.13)
  40 + activesupport (= 3.2.13)
41 builder (~> 3.0.0) 41 builder (~> 3.0.0)
42 erubis (~> 2.7.0) 42 erubis (~> 2.7.0)
43 journey (~> 1.0.4) 43 journey (~> 1.0.4)
@@ -45,19 +45,19 @@ GEM @@ -45,19 +45,19 @@ GEM
45 rack-cache (~> 1.2) 45 rack-cache (~> 1.2)
46 rack-test (~> 0.6.1) 46 rack-test (~> 0.6.1)
47 sprockets (~> 2.2.1) 47 sprockets (~> 2.2.1)
48 - activemodel (3.2.12)  
49 - activesupport (= 3.2.12) 48 + activemodel (3.2.13)
  49 + activesupport (= 3.2.13)
50 builder (~> 3.0.0) 50 builder (~> 3.0.0)
51 - activerecord (3.2.12)  
52 - activemodel (= 3.2.12)  
53 - activesupport (= 3.2.12) 51 + activerecord (3.2.13)
  52 + activemodel (= 3.2.13)
  53 + activesupport (= 3.2.13)
54 arel (~> 3.0.2) 54 arel (~> 3.0.2)
55 tzinfo (~> 0.3.29) 55 tzinfo (~> 0.3.29)
56 - activeresource (3.2.12)  
57 - activemodel (= 3.2.12)  
58 - activesupport (= 3.2.12)  
59 - activesupport (3.2.12)  
60 - i18n (~> 0.6) 56 + activeresource (3.2.13)
  57 + activemodel (= 3.2.13)
  58 + activesupport (= 3.2.13)
  59 + activesupport (3.2.13)
  60 + i18n (= 0.6.1)
61 multi_json (~> 1.0) 61 multi_json (~> 1.0)
62 acts-as-taggable-on (2.3.3) 62 acts-as-taggable-on (2.3.3)
63 rails (~> 3.0) 63 rails (~> 3.0)
@@ -226,7 +226,7 @@ GEM @@ -226,7 +226,7 @@ GEM
226 multi_json (~> 1.0) 226 multi_json (~> 1.0)
227 multi_xml (>= 0.5.2) 227 multi_xml (>= 0.5.2)
228 httpauth (0.2.0) 228 httpauth (0.2.0)
229 - i18n (0.6.4) 229 + i18n (0.6.1)
230 journey (1.0.4) 230 journey (1.0.4)
231 jquery-atwho-rails (0.1.7) 231 jquery-atwho-rails (0.1.7)
232 jquery-rails (2.1.3) 232 jquery-rails (2.1.3)
@@ -249,7 +249,7 @@ GEM @@ -249,7 +249,7 @@ GEM
249 libv8 (3.3.10.4) 249 libv8 (3.3.10.4)
250 listen (0.5.3) 250 listen (0.5.3)
251 lumberjack (1.0.2) 251 lumberjack (1.0.2)
252 - mail (2.4.4) 252 + mail (2.5.3)
253 i18n (>= 0.4.0) 253 i18n (>= 0.4.0)
254 mime-types (~> 1.16) 254 mime-types (~> 1.16)
255 treetop (~> 1.4.8) 255 treetop (~> 1.4.8)
@@ -257,7 +257,7 @@ GEM @@ -257,7 +257,7 @@ GEM
257 mime-types (1.21) 257 mime-types (1.21)
258 modernizr (2.6.2) 258 modernizr (2.6.2)
259 sprockets (~> 2.0) 259 sprockets (~> 2.0)
260 - multi_json (1.6.1) 260 + multi_json (1.7.1)
261 multi_xml (0.5.3) 261 multi_xml (0.5.3)
262 multipart-post (1.1.5) 262 multipart-post (1.1.5)
263 mustache (0.99.4) 263 mustache (0.99.4)
@@ -323,14 +323,14 @@ GEM @@ -323,14 +323,14 @@ GEM
323 rack 323 rack
324 rack-test (0.6.2) 324 rack-test (0.6.2)
325 rack (>= 1.0) 325 rack (>= 1.0)
326 - rails (3.2.12)  
327 - actionmailer (= 3.2.12)  
328 - actionpack (= 3.2.12)  
329 - activerecord (= 3.2.12)  
330 - activeresource (= 3.2.12)  
331 - activesupport (= 3.2.12) 326 + rails (3.2.13)
  327 + actionmailer (= 3.2.13)
  328 + actionpack (= 3.2.13)
  329 + activerecord (= 3.2.13)
  330 + activeresource (= 3.2.13)
  331 + activesupport (= 3.2.13)
332 bundler (~> 1.0) 332 bundler (~> 1.0)
333 - railties (= 3.2.12) 333 + railties (= 3.2.13)
334 rails-dev-tweaks (0.6.1) 334 rails-dev-tweaks (0.6.1)
335 actionpack (~> 3.1) 335 actionpack (~> 3.1)
336 railties (~> 3.1) 336 railties (~> 3.1)
@@ -342,9 +342,9 @@ GEM @@ -342,9 +342,9 @@ GEM
342 erubis 342 erubis
343 i18n 343 i18n
344 progressbar 344 progressbar
345 - railties (3.2.12)  
346 - actionpack (= 3.2.12)  
347 - activesupport (= 3.2.12) 345 + railties (3.2.13)
  346 + actionpack (= 3.2.13)
  347 + activesupport (= 3.2.13)
348 rack-ssl (~> 1.3.2) 348 rack-ssl (~> 1.3.2)
349 rake (>= 0.8.7) 349 rake (>= 0.8.7)
350 rdoc (~> 3.4) 350 rdoc (~> 3.4)
@@ -464,12 +464,12 @@ GEM @@ -464,12 +464,12 @@ GEM
464 eventmachine (>= 0.12.6) 464 eventmachine (>= 0.12.6)
465 rack (>= 1.0.0) 465 rack (>= 1.0.0)
466 thor (0.17.0) 466 thor (0.17.0)
467 - tilt (1.3.4) 467 + tilt (1.3.6)
468 timers (1.1.0) 468 timers (1.1.0)
469 treetop (1.4.12) 469 treetop (1.4.12)
470 polyglot 470 polyglot
471 polyglot (>= 0.3.1) 471 polyglot (>= 0.3.1)
472 - tzinfo (0.3.35) 472 + tzinfo (0.3.37)
473 uglifier (1.3.0) 473 uglifier (1.3.0)
474 execjs (>= 0.3.0) 474 execjs (>= 0.3.0)
475 multi_json (~> 1.0, >= 1.0.2) 475 multi_json (~> 1.0, >= 1.0.2)
@@ -553,7 +553,7 @@ DEPENDENCIES @@ -553,7 +553,7 @@ DEPENDENCIES
553 pry 553 pry
554 quiet_assets (~> 1.0.1) 554 quiet_assets (~> 1.0.1)
555 rack-mini-profiler 555 rack-mini-profiler
556 - rails (= 3.2.12) 556 + rails (= 3.2.13)
557 rails-dev-tweaks 557 rails-dev-tweaks
558 rails_best_practices 558 rails_best_practices
559 raphael-rails! 559 raphael-rails!