Download as
Browse Code »

Commit fd26e9f0d7971a503dc1b84ac9ebe944926a5e5c

Authored by David Silva
1 parent 646a1447
Exists in gitlab-8.x

Bumps gitlab version to 8.5

Showing 29 changed files with 41 additions and 39 deletions   Show diff stats
@@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres @@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres
21 gem 'devise', '~> 3.5.4' 21 gem 'devise', '~> 3.5.4'
22 gem 'devise-async', '~> 0.9.0' 22 gem 'devise-async', '~> 0.9.0'
23 gem 'doorkeeper', '~> 2.2.0' 23 gem 'doorkeeper', '~> 2.2.0'
24 -gem 'omniauth', '~> 1.2.2' 24 +gem 'omniauth', '~> 1.3.1'
25 gem 'omniauth-azure-oauth2', '~> 0.0.6' 25 gem 'omniauth-azure-oauth2', '~> 0.0.6'
26 gem 'omniauth-bitbucket', '~> 0.0.2' 26 gem 'omniauth-bitbucket', '~> 0.0.2'
27 gem 'omniauth-cas3', '~> 1.1.2' 27 gem 'omniauth-cas3', '~> 1.1.2'
@@ -36,8 +36,9 @@ gem 'omniauth-twitter', '~> 1.2.0' @@ -36,8 +36,9 @@ gem 'omniauth-twitter', '~> 1.2.0'
36 gem 'omniauth_crowd', '~> 2.2.0' 36 gem 'omniauth_crowd', '~> 2.2.0'
37 gem 'rack-oauth2', '~> 1.2.1' 37 gem 'rack-oauth2', '~> 1.2.1'
38 38
39 -# reCAPTCHA protection 39 +# Spam and anti-bot protection
40 gem 'recaptcha', require: 'recaptcha/rails' 40 gem 'recaptcha', require: 'recaptcha/rails'
  41 +gem 'akismet', '~> 2.0'
41 42
42 # Two-factor authentication 43 # Two-factor authentication
43 gem 'devise-two-factor', '~> 2.0.0' 44 gem 'devise-two-factor', '~> 2.0.0'
@@ -49,7 +50,7 @@ gem "browser", '~> 1.0.0' @@ -49,7 +50,7 @@ gem "browser", '~> 1.0.0'
49 50
50 # Extracting information from a git repository 51 # Extracting information from a git repository
51 # Provide access to Gitlab::Git library 52 # Provide access to Gitlab::Git library
52 -gem "gitlab_git", '~> 7.2.24' 53 +gem "gitlab_git", '~> 8.2'
53 54
54 # LDAP Auth 55 # LDAP Auth
55 # GitLab fork with several improvements to original library. For full list of changes 56 # GitLab fork with several improvements to original library. For full list of changes
@@ -104,7 +105,7 @@ gem 'rouge', '~> 1.10.1' @@ -104,7 +105,7 @@ gem 'rouge', '~> 1.10.1'
104 105
105 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s 106 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
106 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM 107 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
107 -gem 'nokogiri', '1.6.7.2' 108 +gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
108 109
109 # Diffs 110 # Diffs
110 gem 'diffy', '~> 3.0.3' 111 gem 'diffy', '~> 3.0.3'
@@ -179,6 +180,9 @@ gem "underscore-rails", "~> 1.8.0" @@ -179,6 +180,9 @@ gem "underscore-rails", "~> 1.8.0"
179 gem "sanitize", '~> 2.0' 180 gem "sanitize", '~> 2.0'
180 gem 'babosa', '~> 1.0.2' 181 gem 'babosa', '~> 1.0.2'
181 182
  183 +# Sanitizes SVG input
  184 +gem "loofah", "~> 2.0.3"
  185 +
182 # Protect against bruteforcing 186 # Protect against bruteforcing
183 gem "rack-attack", '~> 4.3.1' 187 gem "rack-attack", '~> 4.3.1'
184 188
@@ -200,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0' @@ -200,7 +204,7 @@ gem 'jquery-turbolinks', '~> 2.1.0'
200 gem 'addressable', '~> 2.3.8' 204 gem 'addressable', '~> 2.3.8'
201 gem 'bootstrap-sass', '~> 3.3.0' 205 gem 'bootstrap-sass', '~> 3.3.0'
202 gem 'font-awesome-rails', '~> 4.2' 206 gem 'font-awesome-rails', '~> 4.2'
203 -gem 'gitlab_emoji', '~> 0.2.0' 207 +gem 'gitlab_emoji', '~> 0.3.0'
204 gem 'gon', '~> 6.0.1' 208 gem 'gon', '~> 6.0.1'
205 gem 'jquery-atwho-rails', '~> 1.3.2' 209 gem 'jquery-atwho-rails', '~> 1.3.2'
206 gem 'jquery-rails', '~> 4.0.0' 210 gem 'jquery-rails', '~> 4.0.0'
@@ -213,6 +217,9 @@ gem 'select2-rails', '~> 3.5.9' @@ -213,6 +217,9 @@ gem 'select2-rails', '~> 3.5.9'
213 gem 'virtus', '~> 1.0.1' 217 gem 'virtus', '~> 1.0.1'
214 gem 'net-ssh', '~> 3.0.1' 218 gem 'net-ssh', '~> 3.0.1'
215 219
  220 +# Sentry integration
  221 +gem 'sentry-raven', '~> 0.15'
  222 +
216 # Metrics 223 # Metrics
217 group :metrics do 224 group :metrics do
218 gem 'allocations', '~> 1.0', require: false, platform: :mri 225 gem 'allocations', '~> 1.0', require: false, platform: :mri
@@ -294,15 +301,11 @@ end @@ -294,15 +301,11 @@ end
294 301
295 group :production do 302 group :production do
296 gem "gitlab_meta", '7.0' 303 gem "gitlab_meta", '7.0'
297 -  
298 - # Sentry integration  
299 - gem 'sentry-raven'  
300 end 304 end
301 305
302 -gem "newrelic_rpm", '~> 3.9.4.245'  
303 -gem 'newrelic-grape' 306 +gem "newrelic_rpm", '~> 3.14'
304 307
305 -gem 'octokit', '~> 3.7.0' 308 +gem 'octokit', '~> 3.8.0'
306 309
307 gem "mail_room", "~> 0.6.1" 310 gem "mail_room", "~> 0.6.1"
308 311
@@ -49,6 +49,7 @@ GEM @@ -49,6 +49,7 @@ GEM
49 addressable (2.3.8) 49 addressable (2.3.8)
50 after_commit_queue (1.3.0) 50 after_commit_queue (1.3.0)
51 activerecord (>= 3.0) 51 activerecord (>= 3.0)
  52 + akismet (2.0.0)
52 allocations (1.0.4) 53 allocations (1.0.4)
53 annotate (2.6.10) 54 annotate (2.6.10)
54 activerecord (>= 3.2, <= 4.3) 55 activerecord (>= 3.2, <= 4.3)
@@ -101,7 +102,7 @@ GEM @@ -101,7 +102,7 @@ GEM
101 bullet (5.0.0) 102 bullet (5.0.0)
102 activesupport (>= 3.0.0) 103 activesupport (>= 3.0.0)
103 uniform_notifier (~> 1.9.0) 104 uniform_notifier (~> 1.9.0)
104 - bundler-audit (0.4.0) 105 + bundler-audit (0.5.0)
105 bundler (~> 1.2) 106 bundler (~> 1.2)
106 thor (~> 0.18) 107 thor (~> 0.18)
107 byebug (8.2.2) 108 byebug (8.2.2)
@@ -134,7 +135,7 @@ GEM @@ -134,7 +135,7 @@ GEM
134 execjs 135 execjs
135 coffee-script-source (1.10.0) 136 coffee-script-source (1.10.0)
136 colorize (0.7.7) 137 colorize (0.7.7)
137 - concurrent-ruby (1.0.0) 138 + concurrent-ruby (1.0.1)
138 connection_pool (2.2.0) 139 connection_pool (2.2.0)
139 coveralls (0.8.9) 140 coveralls (0.8.9)
140 json (~> 1.8) 141 json (~> 1.8)
@@ -174,7 +175,7 @@ GEM @@ -174,7 +175,7 @@ GEM
174 diff-lcs (1.2.5) 175 diff-lcs (1.2.5)
175 diffy (3.0.7) 176 diffy (3.0.7)
176 docile (1.1.5) 177 docile (1.1.5)
177 - domain_name (0.5.20160128) 178 + domain_name (0.5.20160216)
178 unf (>= 0.0.5, < 1.0.0) 179 unf (>= 0.0.5, < 1.0.0)
179 doorkeeper (2.2.2) 180 doorkeeper (2.2.2)
180 railties (>= 3.2) 181 railties (>= 3.2)
@@ -189,7 +190,7 @@ GEM @@ -189,7 +190,7 @@ GEM
189 erubis (2.7.0) 190 erubis (2.7.0)
190 escape_utils (1.1.0) 191 escape_utils (1.1.0)
191 eventmachine (1.0.9.1) 192 eventmachine (1.0.9.1)
192 - excon (0.45.4) 193 + excon (0.46.0)
193 execjs (2.6.0) 194 execjs (2.6.0)
194 expression_parser (0.9.0) 195 expression_parser (0.9.0)
195 factory_girl (4.3.0) 196 factory_girl (4.3.0)
@@ -354,13 +355,13 @@ GEM @@ -354,13 +355,13 @@ GEM
354 diff-lcs (~> 1.1) 355 diff-lcs (~> 1.1)
355 mime-types (~> 1.15) 356 mime-types (~> 1.15)
356 posix-spawn (~> 0.3) 357 posix-spawn (~> 0.3)
357 - gitlab_emoji (0.2.1)  
358 - gemojione (~> 2.1)  
359 - gitlab_git (7.2.24) 358 + gitlab_emoji (0.3.1)
  359 + gemojione (~> 2.2, >= 2.2.1)
  360 + gitlab_git (8.2.0)
360 activesupport (~> 4.0) 361 activesupport (~> 4.0)
361 charlock_holmes (~> 0.7.3) 362 charlock_holmes (~> 0.7.3)
362 github-linguist (~> 4.7.0) 363 github-linguist (~> 4.7.0)
363 - rugged (~> 0.23.3) 364 + rugged (~> 0.24.0b13)
364 gitlab_meta (7.0) 365 gitlab_meta (7.0)
365 gitlab_omniauth-ldap (1.2.1) 366 gitlab_omniauth-ldap (1.2.1)
366 net-ldap (~> 0.9) 367 net-ldap (~> 0.9)
@@ -407,7 +408,7 @@ GEM @@ -407,7 +408,7 @@ GEM
407 hashie (3.4.3) 408 hashie (3.4.3)
408 highline (1.7.8) 409 highline (1.7.8)
409 hike (1.2.3) 410 hike (1.2.3)
410 - hipchat (1.5.2) 411 + hipchat (1.5.3)
411 httparty 412 httparty
412 mimemagic 413 mimemagic
413 html-pipeline (1.11.0) 414 html-pipeline (1.11.0)
@@ -445,7 +446,7 @@ GEM @@ -445,7 +446,7 @@ GEM
445 jquery-ui-rails (5.0.5) 446 jquery-ui-rails (5.0.5)
446 railties (>= 3.2.16) 447 railties (>= 3.2.16)
447 json (1.8.3) 448 json (1.8.3)
448 - jwt (1.5.2) 449 + jwt (1.5.3)
449 kaminari (0.16.3) 450 kaminari (0.16.3)
450 actionpack (>= 3.0.0) 451 actionpack (>= 3.0.0)
451 activesupport (>= 3.0.0) 452 activesupport (>= 3.0.0)
@@ -478,10 +479,7 @@ GEM @@ -478,10 +479,7 @@ GEM
478 net-ldap (0.14.0) 479 net-ldap (0.14.0)
479 net-ssh (3.0.2) 480 net-ssh (3.0.2)
480 netrc (0.11.0) 481 netrc (0.11.0)
481 - newrelic-grape (2.1.0)  
482 - grape  
483 - newrelic_rpm  
484 - newrelic_rpm (3.9.4.245) 482 + newrelic_rpm (3.15.0.314)
485 nokogiri (1.6.7.2) 483 nokogiri (1.6.7.2)
486 mini_portile2 (~> 2.0.0.rc2) 484 mini_portile2 (~> 2.0.0.rc2)
487 nprogress-rails (0.1.6.7) 485 nprogress-rails (0.1.6.7)
@@ -492,11 +490,11 @@ GEM @@ -492,11 +490,11 @@ GEM
492 multi_json (~> 1.3) 490 multi_json (~> 1.3)
493 multi_xml (~> 0.5) 491 multi_xml (~> 0.5)
494 rack (~> 1.2) 492 rack (~> 1.2)
495 - octokit (3.7.1) 493 + octokit (3.8.0)
496 sawyer (~> 0.6.0, >= 0.5.3) 494 sawyer (~> 0.6.0, >= 0.5.3)
497 - omniauth (1.2.2) 495 + omniauth (1.3.1)
498 hashie (>= 1.2, < 4) 496 hashie (>= 1.2, < 4)
499 - rack (~> 1.0) 497 + rack (>= 1.0, < 3)
500 omniauth-azure-oauth2 (0.0.6) 498 omniauth-azure-oauth2 (0.0.6)
501 jwt (~> 1.0) 499 jwt (~> 1.0)
502 omniauth (~> 1.0) 500 omniauth (~> 1.0)
@@ -705,7 +703,7 @@ GEM @@ -705,7 +703,7 @@ GEM
705 rubyntlm (0.6.0) 703 rubyntlm (0.6.0)
706 rubypants (0.2.0) 704 rubypants (0.2.0)
707 rufus-scheduler (3.2.0) 705 rufus-scheduler (3.2.0)
708 - rugged (0.23.3) 706 + rugged (0.24.0b13)
709 safe_yaml (1.0.4) 707 safe_yaml (1.0.4)
710 sanitize (2.1.0) 708 sanitize (2.1.0)
711 nokogiri (>= 1.4.4) 709 nokogiri (>= 1.4.4)
@@ -885,6 +883,7 @@ DEPENDENCIES @@ -885,6 +883,7 @@ DEPENDENCIES
885 acts-as-taggable-on (~> 3.4) 883 acts-as-taggable-on (~> 3.4)
886 addressable (~> 2.3.8) 884 addressable (~> 2.3.8)
887 after_commit_queue 885 after_commit_queue
  886 + akismet (~> 2.0)
888 allocations (~> 1.0) 887 allocations (~> 1.0)
889 annotate (~> 2.6.0) 888 annotate (~> 2.6.0)
890 asana (~> 0.4.0) 889 asana (~> 0.4.0)
@@ -934,8 +933,8 @@ DEPENDENCIES @@ -934,8 +933,8 @@ DEPENDENCIES
934 github-linguist (~> 4.7.0) 933 github-linguist (~> 4.7.0)
935 github-markup (~> 1.3.1) 934 github-markup (~> 1.3.1)
936 gitlab-flowdock-git-hook (~> 1.0.1) 935 gitlab-flowdock-git-hook (~> 1.0.1)
937 - gitlab_emoji (~> 0.2.0)  
938 - gitlab_git (~> 7.2.24) 936 + gitlab_emoji (~> 0.3.0)
  937 + gitlab_git (~> 8.2)
939 gitlab_meta (= 7.0) 938 gitlab_meta (= 7.0)
940 gitlab_omniauth-ldap (~> 1.2.1) 939 gitlab_omniauth-ldap (~> 1.2.1)
941 gollum-lib (~> 4.1.0) 940 gollum-lib (~> 4.1.0)
@@ -954,6 +953,7 @@ DEPENDENCIES @@ -954,6 +953,7 @@ DEPENDENCIES
954 jquery-ui-rails (~> 5.0.0) 953 jquery-ui-rails (~> 5.0.0)
955 kaminari (~> 0.16.3) 954 kaminari (~> 0.16.3)
956 letter_opener (~> 1.1.2) 955 letter_opener (~> 1.1.2)
  956 + loofah (~> 2.0.3)
957 mail_room (~> 0.6.1) 957 mail_room (~> 0.6.1)
958 method_source (~> 0.8) 958 method_source (~> 0.8)
959 minitest (~> 5.7.0) 959 minitest (~> 5.7.0)
@@ -961,13 +961,12 @@ DEPENDENCIES @@ -961,13 +961,12 @@ DEPENDENCIES
961 mysql2 (~> 0.3.16) 961 mysql2 (~> 0.3.16)
962 nested_form (~> 0.3.2) 962 nested_form (~> 0.3.2)
963 net-ssh (~> 3.0.1) 963 net-ssh (~> 3.0.1)
964 - newrelic-grape  
965 - newrelic_rpm (~> 3.9.4.245)  
966 - nokogiri (= 1.6.7.2) 964 + newrelic_rpm (~> 3.14)
  965 + nokogiri (~> 1.6.7, >= 1.6.7.2)
967 nprogress-rails (~> 0.1.6.7) 966 nprogress-rails (~> 0.1.6.7)
968 oauth2 (~> 1.0.0) 967 oauth2 (~> 1.0.0)
969 - octokit (~> 3.7.0)  
970 - omniauth (~> 1.2.2) 968 + octokit (~> 3.8.0)
  969 + omniauth (~> 1.3.1)
971 omniauth-azure-oauth2 (~> 0.0.6) 970 omniauth-azure-oauth2 (~> 0.0.6)
972 omniauth-bitbucket (~> 0.0.2) 971 omniauth-bitbucket (~> 0.0.2)
973 omniauth-cas3 (~> 1.1.2) 972 omniauth-cas3 (~> 1.1.2)
@@ -1012,7 +1011,7 @@ DEPENDENCIES @@ -1012,7 +1011,7 @@ DEPENDENCIES
1012 sdoc (~> 0.3.20) 1011 sdoc (~> 0.3.20)
1013 seed-fu (~> 2.3.5) 1012 seed-fu (~> 2.3.5)
1014 select2-rails (~> 3.5.9) 1013 select2-rails (~> 3.5.9)
1015 - sentry-raven 1014 + sentry-raven (~> 0.15)
1016 settingslogic (~> 2.0.9) 1015 settingslogic (~> 2.0.9)
1017 sham_rack 1016 sham_rack
1018 shoulda-matchers (~> 2.8.0) 1017 shoulda-matchers (~> 2.8.0)
@@ -8,11 +8,11 @@ export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH @@ -8,11 +8,11 @@ export MANPATH := /opt/rh/rh-ruby22/root/usr/share/man:$MANPATH
8 export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} 8 export PKG_CONFIG_PATH := /opt/rh/rh-ruby22/root/usr/lib64/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}}
9 export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}} 9 export XDG_DATA_DIRS := /opt/rh/rh-ruby22/root/usr/share${XDG_DATA_DIRS:+:${XDG_DATA_DIRS}}
10 10
11 -VERSION = 8.4 11 +VERSION = 8.5
12 TARBALL = gitlab-deps-$(VERSION).tar.gz 12 TARBALL = gitlab-deps-$(VERSION).tar.gz
13 PREFIX = /usr 13 PREFIX = /usr
14 WGET = wget 14 WGET = wget
15 -GITLAB_BRANCH = 8-4-stable 15 +GITLAB_BRANCH = 8-5-stable
16 BUNDLE_OPTS = --verbose --without='development test' 16 BUNDLE_OPTS = --verbose --without='development test'
17 17
18 all: 18 all:
vendor/cache/akismet-2.0.0.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/bundler-audit-0.4.0.gem
View file @646a144
No preview for this file type
vendor/cache/bundler-audit-0.5.0.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/concurrent-ruby-1.0.0.gem
View file @646a144
No preview for this file type
vendor/cache/concurrent-ruby-1.0.1.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/domain_name-0.5.20160128.gem
View file @646a144
No preview for this file type
vendor/cache/domain_name-0.5.20160216.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/excon-0.45.4.gem
View file @646a144
No preview for this file type
vendor/cache/excon-0.46.0.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/gitlab_emoji-0.2.1.gem
View file @646a144
No preview for this file type
vendor/cache/gitlab_emoji-0.3.1.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/gitlab_git-7.2.24.gem
View file @646a144
No preview for this file type
vendor/cache/gitlab_git-8.2.0.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/hipchat-1.5.2.gem
View file @646a144
No preview for this file type
vendor/cache/hipchat-1.5.3.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/jwt-1.5.2.gem
View file @646a144
No preview for this file type
vendor/cache/jwt-1.5.3.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/newrelic-grape-2.1.0.gem
View file @646a144
No preview for this file type
vendor/cache/newrelic_rpm-3.15.0.314.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/newrelic_rpm-3.9.4.245.gem
View file @646a144
No preview for this file type
vendor/cache/octokit-3.7.1.gem
View file @646a144
No preview for this file type
vendor/cache/octokit-3.8.0.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/omniauth-1.2.2.gem
View file @646a144
No preview for this file type
vendor/cache/omniauth-1.3.1.gem 0 → 100644
View file @fd26e9f
No preview for this file type
vendor/cache/rugged-0.23.3.gem
View file @646a144
No preview for this file type
vendor/cache/rugged-0.24.0b13.gem 0 → 100644
View file @fd26e9f
No preview for this file type