Bumps gitlab version to 8.5

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