Download as
Browse Code »

Commit de05a598b3d73a545899f26173cafbaeff474629

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

Update to rails 3.2.10. Use simplercov in spinach too

Showing 4 changed files with 36 additions and 31 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.9" 11 +gem "rails", "3.2.10"
12 12
13 # Supported DBs 13 # Supported DBs
14 gem "mysql2", group: :mysql 14 gem "mysql2", group: :mysql
@@ -74,12 +74,12 @@ GIT @@ -74,12 +74,12 @@ GIT
74 GEM 74 GEM
75 remote: http://rubygems.org/ 75 remote: http://rubygems.org/
76 specs: 76 specs:
77 - actionmailer (3.2.9)  
78 - actionpack (= 3.2.9) 77 + actionmailer (3.2.10)
  78 + actionpack (= 3.2.10)
79 mail (~> 2.4.4) 79 mail (~> 2.4.4)
80 - actionpack (3.2.9)  
81 - activemodel (= 3.2.9)  
82 - activesupport (= 3.2.9) 80 + actionpack (3.2.10)
  81 + activemodel (= 3.2.10)
  82 + activesupport (= 3.2.10)
83 builder (~> 3.0.0) 83 builder (~> 3.0.0)
84 erubis (~> 2.7.0) 84 erubis (~> 2.7.0)
85 journey (~> 1.0.4) 85 journey (~> 1.0.4)
@@ -87,18 +87,18 @@ GEM @@ -87,18 +87,18 @@ GEM
87 rack-cache (~> 1.2) 87 rack-cache (~> 1.2)
88 rack-test (~> 0.6.1) 88 rack-test (~> 0.6.1)
89 sprockets (~> 2.2.1) 89 sprockets (~> 2.2.1)
90 - activemodel (3.2.9)  
91 - activesupport (= 3.2.9) 90 + activemodel (3.2.10)
  91 + activesupport (= 3.2.10)
92 builder (~> 3.0.0) 92 builder (~> 3.0.0)
93 - activerecord (3.2.9)  
94 - activemodel (= 3.2.9)  
95 - activesupport (= 3.2.9) 93 + activerecord (3.2.10)
  94 + activemodel (= 3.2.10)
  95 + activesupport (= 3.2.10)
96 arel (~> 3.0.2) 96 arel (~> 3.0.2)
97 tzinfo (~> 0.3.29) 97 tzinfo (~> 0.3.29)
98 - activeresource (3.2.9)  
99 - activemodel (= 3.2.9)  
100 - activesupport (= 3.2.9)  
101 - activesupport (3.2.9) 98 + activeresource (3.2.10)
  99 + activemodel (= 3.2.10)
  100 + activesupport (= 3.2.10)
  101 + activesupport (3.2.10)
102 i18n (~> 0.6) 102 i18n (~> 0.6)
103 multi_json (~> 1.0) 103 multi_json (~> 1.0)
104 acts-as-taggable-on (2.3.3) 104 acts-as-taggable-on (2.3.3)
@@ -245,7 +245,7 @@ GEM @@ -245,7 +245,7 @@ GEM
245 jquery-ui-rails (2.0.2) 245 jquery-ui-rails (2.0.2)
246 jquery-rails 246 jquery-rails
247 railties (>= 3.1.0) 247 railties (>= 3.1.0)
248 - json (1.7.5) 248 + json (1.7.6)
249 jwt (0.1.5) 249 jwt (0.1.5)
250 multi_json (>= 1.0) 250 multi_json (>= 1.0)
251 kaminari (0.14.1) 251 kaminari (0.14.1)
@@ -269,7 +269,7 @@ GEM @@ -269,7 +269,7 @@ GEM
269 mime-types (1.19) 269 mime-types (1.19)
270 modernizr (2.6.2) 270 modernizr (2.6.2)
271 sprockets (~> 2.0) 271 sprockets (~> 2.0)
272 - multi_json (1.3.7) 272 + multi_json (1.5.0)
273 multi_xml (0.5.1) 273 multi_xml (0.5.1)
274 multipart-post (1.1.5) 274 multipart-post (1.1.5)
275 mysql2 (0.3.11) 275 mysql2 (0.3.11)
@@ -327,14 +327,14 @@ GEM @@ -327,14 +327,14 @@ GEM
327 rack 327 rack
328 rack-test (0.6.2) 328 rack-test (0.6.2)
329 rack (>= 1.0) 329 rack (>= 1.0)
330 - rails (3.2.9)  
331 - actionmailer (= 3.2.9)  
332 - actionpack (= 3.2.9)  
333 - activerecord (= 3.2.9)  
334 - activeresource (= 3.2.9)  
335 - activesupport (= 3.2.9) 330 + rails (3.2.10)
  331 + actionmailer (= 3.2.10)
  332 + actionpack (= 3.2.10)
  333 + activerecord (= 3.2.10)
  334 + activeresource (= 3.2.10)
  335 + activesupport (= 3.2.10)
336 bundler (~> 1.0) 336 bundler (~> 1.0)
337 - railties (= 3.2.9) 337 + railties (= 3.2.10)
338 rails-dev-tweaks (0.6.1) 338 rails-dev-tweaks (0.6.1)
339 actionpack (~> 3.1) 339 actionpack (~> 3.1)
340 railties (~> 3.1) 340 railties (~> 3.1)
@@ -346,15 +346,15 @@ GEM @@ -346,15 +346,15 @@ GEM
346 erubis 346 erubis
347 i18n 347 i18n
348 progressbar 348 progressbar
349 - railties (3.2.9)  
350 - actionpack (= 3.2.9)  
351 - activesupport (= 3.2.9) 349 + railties (3.2.10)
  350 + actionpack (= 3.2.10)
  351 + activesupport (= 3.2.10)
352 rack-ssl (~> 1.3.2) 352 rack-ssl (~> 1.3.2)
353 rake (>= 0.8.7) 353 rake (>= 0.8.7)
354 rdoc (~> 3.4) 354 rdoc (~> 3.4)
355 thor (>= 0.14.6, < 2.0) 355 thor (>= 0.14.6, < 2.0)
356 raindrops (0.10.0) 356 raindrops (0.10.0)
357 - rake (10.0.1) 357 + rake (10.0.3)
358 raphael-rails (1.5.2) 358 raphael-rails (1.5.2)
359 rb-fsevent (0.9.2) 359 rb-fsevent (0.9.2)
360 rb-inotify (0.8.8) 360 rb-inotify (0.8.8)
@@ -424,7 +424,7 @@ GEM @@ -424,7 +424,7 @@ GEM
424 capybara (~> 1) 424 capybara (~> 1)
425 railties (>= 3) 425 railties (>= 3)
426 spinach (>= 0.4) 426 spinach (>= 0.4)
427 - sprockets (2.2.1) 427 + sprockets (2.2.2)
428 hike (~> 1.2) 428 hike (~> 1.2)
429 multi_json (~> 1.0) 429 multi_json (~> 1.0)
430 rack (~> 1.0) 430 rack (~> 1.0)
@@ -522,7 +522,7 @@ DEPENDENCIES @@ -522,7 +522,7 @@ DEPENDENCIES
522 pygments.rb! 522 pygments.rb!
523 quiet_assets (~> 1.0.1) 523 quiet_assets (~> 1.0.1)
524 rack-mini-profiler 524 rack-mini-profiler
525 - rails (= 3.2.9) 525 + rails (= 3.2.10)
526 rails-dev-tweaks 526 rails-dev-tweaks
527 rails_best_practices 527 rails_best_practices
528 raphael-rails (= 1.5.2) 528 raphael-rails (= 1.5.2)
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @de05a59
@@ -228,6 +228,6 @@ td .line_note_link { @@ -228,6 +228,6 @@ td .line_note_link {
228 } 228 }
229 229
230 .note-text { 230 .note-text {
231 - border: 1px solid #aaa; 231 + border: 1px solid #DDD;
232 box-shadow: none; 232 box-shadow: none;
233 } 233 }
features/support/env.rb
  Diff comments   View file @de05a59
  1 +unless ENV['CI']
  2 + require 'simplecov'
  3 + SimpleCov.start 'rails'
  4 +end
  5 +
1 ENV['RAILS_ENV'] = 'test' 6 ENV['RAILS_ENV'] = 'test'
2 require './config/environment' 7 require './config/environment'
3 8