Attachment #189440 for bug #224932

View | Details | Raw Unified | Return to bug 224932
Collapse All | Expand All

Lines 185-191 RUN_DEPENDS= git>=2.14.1:devel/git \ Link Here

(-)b/www/gitlab/Makefile (-1 / +2 lines)
185	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \	185	rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
186	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \	186	rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
187	rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \	187	rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \
188	rubygem-rbnacl>=4.0:security/rubygem-rbnacl \	188	rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
189	rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \	189	rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
190	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \	190	rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
191	rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \	191	rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \
Lines 253-255 do-install: Link Here
253	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})	253	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
254		254
255	.include <bsd.port.mk>	255	.include <bsd.port.mk>
		256

Lines 163-169 Link Here

(-)b/www/gitlab/files/patch-Gemfile (-7 / +15 lines)
163		163
164	# GitLab settings	164	# GitLab settings
165	gem 'settingslogic', '~> 2.0.9'	165	gem 'settingslogic', '~> 2.0.9'
166	@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1'	166	@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1'
167		167
168	# Misc	168	# Misc
169		169
Lines 172-178 Link Here
172		172
173	# Cache	173	# Cache
174	gem 'redis-rails', '~> 5.0.1'	174	gem 'redis-rails', '~> 5.0.1'
175	@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2'	175
		176	# Redis
		177	-gem 'redis', '~> 3.2'
		178	+gem 'redis', '>= 3.2'
176	gem 'connection_pool', '~> 2.0'	179	gem 'connection_pool', '~> 2.0'
177		180
178	# HipChat integration	181	# HipChat integration
Lines 214-220 Link Here
214		217
215	# Ace editor	218	# Ace editor
216	gem 'ace-rails-ap', '~> 4.1.0'	219	gem 'ace-rails-ap', '~> 4.1.0'
217	@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2'	220	@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2'
218	gem 'chronic_duration', '~> 0.10.6'	221	gem 'chronic_duration', '~> 0.10.6'
219		222
220	gem 'webpack-rails', '~> 0.9.10'	223	gem 'webpack-rails', '~> 0.9.10'
Lines 245-253 Link Here
245	-gem 'sentry-raven', '~> 2.5.3'	248	-gem 'sentry-raven', '~> 2.5.3'
246	+gem 'sentry-raven', '>= 2.5.3'	249	+gem 'sentry-raven', '>= 2.5.3'
247		250
248	gem 'premailer-rails', '~> 1.9.7'	251	-gem 'premailer-rails', '~> 1.9.7'
		252	+gem 'premailer-rails', '>= 1.9.7'
249		253
250	@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7'	254	# I18n
251	gem 'ruby_parser', '~> 3.8', require: false	255	gem 'ruby_parser', '~> 3.8', require: false
252	gem 'rails-i18n', '~> 4.0.9'	256	gem 'rails-i18n', '~> 4.0.9'
253	gem 'gettext_i18n_rails', '~> 1.8.0'	257	gem 'gettext_i18n_rails', '~> 1.8.0'
Lines 369-375 Link Here
369	+gem 'email_reply_trimmer', '>= 0.1'	373	+gem 'email_reply_trimmer', '>= 0.1'
370	gem 'html2text'	374	gem 'html2text'
371		375
372	gem 'ruby-prof', '~> 0.16.2'	376	-gem 'ruby-prof', '~> 0.16.2'
		377	+gem 'ruby-prof', '>= 0.16.2'
373		378
374	# OAuth	379	# OAuth
375	-gem 'oauth2', '~> 1.4'	380	-gem 'oauth2', '~> 1.4'
Lines 393-399 Link Here
393		398
394	# Required for ED25519 SSH host key support	399	# Required for ED25519 SSH host key support
395	group :ed25519 do	400	group :ed25519 do
396	@@ -398,9 +314,9 @@ group :ed25519 do	401	gem 'rbnacl-libsodium'
		402	- gem 'rbnacl', '~> 4.0'
		403	+ gem 'rbnacl', '~> 4.0.2'
		404	gem 'bcrypt_pbkdf', '~> 1.0'
397	end	405	end
398		406
399	# Gitaly GRPC client	407	# Gitaly GRPC client

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_database.yml.postgresql (-1 / +1 lines)
1	--- config/database.yml.postgresql.orig 2017-11-14 20:51:25 UTC	1	--- config/database.yml.postgresql.orig 2017-12-07 12:02:52 UTC
2	+++ config/database.yml.postgresql	2	+++ config/database.yml.postgresql
3	@@ -6,7 +6,7 @@ production:	3	@@ -6,7 +6,7 @@ production:
4	encoding: unicode	4	encoding: unicode

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_gitlab.yml.example (-1 / +1 lines)
1	--- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC	1	--- config/gitlab.yml.example.orig 2017-12-07 12:02:52 UTC
2	+++ config/gitlab.yml.example	2	+++ config/gitlab.yml.example
3	@@ -519,8 +519,8 @@ production: &base	3	@@ -519,8 +519,8 @@ production: &base
4	# real path not the symlink.	4	# real path not the symlink.

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_initializers_1__settings.rb (-1 / +1 lines)
1	--- config/initializers/1_settings.rb.orig 2017-11-14 20:51:25 UTC	1	--- config/initializers/1_settings.rb.orig 2017-12-07 12:02:52 UTC
2	+++ config/initializers/1_settings.rb	2	+++ config/initializers/1_settings.rb
3	@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix']	3	@@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix']
4	Settings.gitlab['base_url'] \|\|= Settings.__send__(:build_base_gitlab_url)	4	Settings.gitlab['base_url'] \|\|= Settings.__send__(:build_base_gitlab_url)

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-config_unicorn.rb.example (-1 / +1 lines)
1	--- config/unicorn.rb.example.orig 2017-06-07 20:58:14 UTC	1	--- config/unicorn.rb.example.orig 2017-12-07 12:02:52 UTC
2	+++ config/unicorn.rb.example	2	+++ config/unicorn.rb.example
3	@@ -33,12 +33,12 @@ worker_processes 3	3	@@ -33,12 +33,12 @@ worker_processes 3
4		4

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_gitlab_recaptcha.rb (-1 / +1 lines)
1	--- lib/gitlab/recaptcha.rb.orig 2017-11-14 20:51:25 UTC	1	--- lib/gitlab/recaptcha.rb.orig 2017-12-07 12:02:52 UTC
2	+++ lib/gitlab/recaptcha.rb	2	+++ lib/gitlab/recaptcha.rb
3	@@ -5,8 +5,8 @@ module Gitlab	3	@@ -5,8 +5,8 @@ module Gitlab
4	def self.load_configurations!	4	def self.load_configurations!

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_support_nginx_gitlab (-1 / +1 lines)
1	--- lib/support/nginx/gitlab.orig 2017-11-14 20:51:25 UTC	1	--- lib/support/nginx/gitlab.orig 2017-12-07 12:02:52 UTC
2	+++ lib/support/nginx/gitlab	2	+++ lib/support/nginx/gitlab
3	@@ -17,7 +17,7 @@	3	@@ -17,7 +17,7 @@
4	## See installation.md#using-https for additional HTTPS configuration details.	4	## See installation.md#using-https for additional HTTPS configuration details.

Lines 1-4 Link Here

(-)b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl (-1 / +1 lines)
1	--- lib/support/nginx/gitlab-ssl.orig 2017-11-14 20:51:25 UTC	1	--- lib/support/nginx/gitlab-ssl.orig 2017-12-07 12:02:52 UTC
2	+++ lib/support/nginx/gitlab-ssl	2	+++ lib/support/nginx/gitlab-ssl
3	@@ -21,7 +21,7 @@	3	@@ -21,7 +21,7 @@
4	## See installation.md#using-https for additional HTTPS configuration details.	4	## See installation.md#using-https for additional HTTPS configuration details.

Return to bug 224932