Download as
Browse Code »

Commit bfdcbc5380119b82bfbe1927c7daf2ae1d53fe19

Authored by Dmitriy Zaporozhets
2 parents 31979907 7ae04039
Exists in 6-8-stable

Merge branch '6-8-2' into '6-8-stable' 

6.8.2 release

Please check if I didn't do this weird git thing wrong ;-)

/cc @marin @jacobvosmaer
Showing 4 changed files with 34 additions and 30 deletions   Show diff stats
  1 +v 6.8.2
  2 + - Bump rails to 4.0.5 in light of CVE-2014-0130
  3 +
1 v 6.8.1 4 v 6.8.1
2 - Bump required gitlab-shell version to 1.9.3 5 - Bump required gitlab-shell version to 1.9.3
3 6
@@ -148,7 +148,7 @@ gem "rack-attack" @@ -148,7 +148,7 @@ gem "rack-attack"
148 # Ace editor 148 # Ace editor
149 gem 'ace-rails-ap' 149 gem 'ace-rails-ap'
150 150
151 -gem "sass-rails" 151 +gem "sass-rails", '~> 4.0.2'
152 gem "coffee-rails" 152 gem "coffee-rails"
153 gem "uglifier" 153 gem "uglifier"
154 gem "therubyracer" 154 gem "therubyracer"
@@ -232,4 +232,4 @@ end @@ -232,4 +232,4 @@ end
232 232
233 group :production do 233 group :production do
234 gem "gitlab_meta", '6.0' 234 gem "gitlab_meta", '6.0'
235 -end  
236 \ No newline at end of file 235 \ No newline at end of file
  236 +end
@@ -2,26 +2,26 @@ GEM @@ -2,26 +2,26 @@ GEM
2 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
3 specs: 3 specs:
4 ace-rails-ap (2.0.1) 4 ace-rails-ap (2.0.1)
5 - actionmailer (4.0.3)  
6 - actionpack (= 4.0.3) 5 + actionmailer (4.0.5)
  6 + actionpack (= 4.0.5)
7 mail (~> 2.5.4) 7 mail (~> 2.5.4)
8 - actionpack (4.0.3)  
9 - activesupport (= 4.0.3) 8 + actionpack (4.0.5)
  9 + activesupport (= 4.0.5)
10 builder (~> 3.1.0) 10 builder (~> 3.1.0)
11 erubis (~> 2.7.0) 11 erubis (~> 2.7.0)
12 rack (~> 1.5.2) 12 rack (~> 1.5.2)
13 rack-test (~> 0.6.2) 13 rack-test (~> 0.6.2)
14 - activemodel (4.0.3)  
15 - activesupport (= 4.0.3) 14 + activemodel (4.0.5)
  15 + activesupport (= 4.0.5)
16 builder (~> 3.1.0) 16 builder (~> 3.1.0)
17 - activerecord (4.0.3)  
18 - activemodel (= 4.0.3) 17 + activerecord (4.0.5)
  18 + activemodel (= 4.0.5)
19 activerecord-deprecated_finders (~> 1.0.2) 19 activerecord-deprecated_finders (~> 1.0.2)
20 - activesupport (= 4.0.3) 20 + activesupport (= 4.0.5)
21 arel (~> 4.0.0) 21 arel (~> 4.0.0)
22 activerecord-deprecated_finders (1.0.3) 22 activerecord-deprecated_finders (1.0.3)
23 - activesupport (4.0.3)  
24 - i18n (~> 0.6, >= 0.6.4) 23 + activesupport (4.0.5)
  24 + i18n (~> 0.6, >= 0.6.9)
25 minitest (~> 4.2) 25 minitest (~> 4.2)
26 multi_json (~> 1.3) 26 multi_json (~> 1.3)
27 thread_safe (~> 0.1) 27 thread_safe (~> 0.1)
@@ -280,7 +280,7 @@ GEM @@ -280,7 +280,7 @@ GEM
280 mime-types (1.25.1) 280 mime-types (1.25.1)
281 mini_portile (0.5.3) 281 mini_portile (0.5.3)
282 minitest (4.7.5) 282 minitest (4.7.5)
283 - multi_json (1.9.2) 283 + multi_json (1.10.0)
284 multi_xml (0.5.5) 284 multi_xml (0.5.5)
285 multipart-post (1.2.0) 285 multipart-post (1.2.0)
286 mysql2 (0.3.11) 286 mysql2 (0.3.11)
@@ -350,13 +350,13 @@ GEM @@ -350,13 +350,13 @@ GEM
350 rack 350 rack
351 rack-test (0.6.2) 351 rack-test (0.6.2)
352 rack (>= 1.0) 352 rack (>= 1.0)
353 - rails (4.0.3)  
354 - actionmailer (= 4.0.3)  
355 - actionpack (= 4.0.3)  
356 - activerecord (= 4.0.3)  
357 - activesupport (= 4.0.3) 353 + rails (4.0.5)
  354 + actionmailer (= 4.0.5)
  355 + actionpack (= 4.0.5)
  356 + activerecord (= 4.0.5)
  357 + activesupport (= 4.0.5)
358 bundler (>= 1.3.0, < 2.0) 358 bundler (>= 1.3.0, < 2.0)
359 - railties (= 4.0.3) 359 + railties (= 4.0.5)
360 sprockets-rails (~> 2.0.0) 360 sprockets-rails (~> 2.0.0)
361 rails-observers (0.1.2) 361 rails-observers (0.1.2)
362 activemodel (~> 4.0) 362 activemodel (~> 4.0)
@@ -369,9 +369,9 @@ GEM @@ -369,9 +369,9 @@ GEM
369 i18n 369 i18n
370 require_all 370 require_all
371 ruby-progressbar 371 ruby-progressbar
372 - railties (4.0.3)  
373 - actionpack (= 4.0.3)  
374 - activesupport (= 4.0.3) 372 + railties (4.0.5)
  373 + actionpack (= 4.0.5)
  374 + activesupport (= 4.0.5)
375 rake (>= 0.8.7) 375 rake (>= 0.8.7)
376 thor (>= 0.18.1, < 2.0) 376 thor (>= 0.18.1, < 2.0)
377 raindrops (0.12.0) 377 raindrops (0.12.0)
@@ -428,11 +428,12 @@ GEM @@ -428,11 +428,12 @@ GEM
428 safe_yaml (0.9.7) 428 safe_yaml (0.9.7)
429 sanitize (2.1.0) 429 sanitize (2.1.0)
430 nokogiri (>= 1.4.4) 430 nokogiri (>= 1.4.4)
431 - sass (3.2.12)  
432 - sass-rails (4.0.1) 431 + sass (3.2.19)
  432 + sass-rails (4.0.3)
433 railties (>= 4.0.0, < 5.0) 433 railties (>= 4.0.0, < 5.0)
434 - sass (>= 3.1.10)  
435 - sprockets-rails (~> 2.0.0) 434 + sass (~> 3.2.0)
  435 + sprockets (~> 2.8, <= 2.11.0)
  436 + sprockets-rails (~> 2.0)
436 sdoc (0.3.20) 437 sdoc (0.3.20)
437 json (>= 1.1.3) 438 json (>= 1.1.3)
438 rdoc (~> 3.10) 439 rdoc (~> 3.10)
@@ -479,7 +480,7 @@ GEM @@ -479,7 +480,7 @@ GEM
479 spring (>= 0.9.1) 480 spring (>= 0.9.1)
480 spring-commands-spinach (1.0.0) 481 spring-commands-spinach (1.0.0)
481 spring (>= 0.9.1) 482 spring (>= 0.9.1)
482 - sprockets (2.10.1) 483 + sprockets (2.11.0)
483 hike (~> 1.2) 484 hike (~> 1.2)
484 multi_json (~> 1.0) 485 multi_json (~> 1.0)
485 rack (~> 1.0) 486 rack (~> 1.0)
@@ -634,7 +635,7 @@ DEPENDENCIES @@ -634,7 +635,7 @@ DEPENDENCIES
634 redis-rails 635 redis-rails
635 rspec-rails 636 rspec-rails
636 sanitize (~> 2.0) 637 sanitize (~> 2.0)
637 - sass-rails 638 + sass-rails (~> 4.0.2)
638 sdoc 639 sdoc
639 seed-fu 640 seed-fu
640 select2-rails 641 select2-rails
1 -6.8.1 1 +6.8.2