mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-18 03:46:03 +00:00
Code Issues Releases Activity

Update www/gitlab to 10.8.4.

Browse Source 
Incremental rollouts, plus open source push mirroring
See here for all details: https://about.gitlab.com/2018/05/22/gitlab-10-8-released/

Reviewed by:	mat, swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15950
This commit is contained in:
Matthias Fechner 2018-06-21 15:45:20 +00:00
parent 7950a65c0e
commit 5c346d7fe4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=472981
8 changed files with 497 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
www/gitlab/Makefile
View File

@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 10.7.5
PORTVERSION= 10.8.4
DISTVERSIONPREFIX= v
PORTREVISION= 1
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@ -28,7 +27,7 @@ BUILD_DEPENDS= gem:devel/ruby-gems
RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=7.1.2:devel/gitlab-shell \
gitlab-workhorse>=4.1.0:www/gitlab-workhorse \
gitaly>=0.96.1:devel/gitaly \
gitaly>=0.100.0:devel/gitaly \
gitlab-pages>=0.9.1:www/gitlab-pages \
redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \
@ -41,7 +40,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-rugged>=0.27.0:devel/rubygem-rugged \
rubygem-grape-route-helpers>=2.1.0:devel/rubygem-grape-route-helpers \
rubygem-faraday>=0.12.0:www/rubygem-faraday \
rubygem-devise>=4.2:devel/rubygem-devise \
rubygem-devise>=4.4:devel/rubygem-devise \
rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \
rubygem-doorkeeper-openid_connect>=1.3:security/rubygem-doorkeeper-openid_connect \
rubygem-omniauth>=1.8:security/rubygem-omniauth \
@ -49,7 +48,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \
rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \
rubygem-omniauth-facebook4>=4.0.0:net/rubygem-omniauth-facebook4 \
rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \
rubygem-omniauth-github>=1.3.0:net/rubygem-omniauth-github \
rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
rubygem-omniauth-google-oauth2>=0.5.3:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \
@ -72,11 +71,11 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-gpgme>=2.0.13:security/rubygem-gpgme \
rubygem-gitlab_omniauth-ldap>=2.0.4:net/rubygem-gitlab_omniauth-ldap \
rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \
rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
rubygem-gitlab-gollum-lib>=4.2.0:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4:www/rubygem-gitlab-gollum-rugged_adapter \
rubygem-github-linguist53>=5.3.3:textproc/rubygem-github-linguist53 \
rubygem-grape>=1.0:devel/rubygem-grape \
rubygem-grape-entity060>=0.6.0:devel/rubygem-grape-entity060 \
rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \
rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \
rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \
@ -105,7 +104,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \
rubygem-asciidoctor>=1.5.6:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \
rubygem-rouge>=3.1:textproc/rubygem-rouge \
rubygem-truncato>=0.7.9:textproc/rubygem-truncato \
rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \
rubygem-nokogiri>=1.8.2:textproc/rubygem-nokogiri \
@ -124,6 +123,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
rubygem-re2>=1.1.1:devel/rubygem-re2 \
rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \
rubygem-device_detector>=0:devel/rubygem-device_detector \
rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \
rubygem-redis3>=3.2:databases/rubygem-redis3 \
rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
@ -172,11 +172,10 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-batch-loader>=1.2.1:devel/rubygem-batch-loader \
rubygem-peek>=1.0.1:devel/rubygem-peek \
rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \
rubygem-peek-performance_bar>=1.3.0:devel/rubygem-peek-performance_bar \
rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \
rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \
rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \
rubygem-prometheus-client-mmap>=0.9.1:devel/rubygem-prometheus-client-mmap \
rubygem-prometheus-client-mmap>=0.9.3:devel/rubygem-prometheus-client-mmap \
rubygem-octokit>=4.8:net/rubygem-octokit \
rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
@ -191,7 +190,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \
rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto096>=0.96.0:net/rubygem-gitaly-proto096 \
rubygem-gitaly-proto099>=0.99.0:net/rubygem-gitaly-proto099 \
rubygem-grpc>=1.11.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \

6
www/gitlab/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1527763488
SHA256 (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 69829e44acec5622b98a957874bd0426779540866bfd5ac6637b2bb331101f30
SIZE (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 47807879
TIMESTAMP = 1529480195
SHA256 (gitlabhq-gitlabhq-v10.8.4_GH0.tar.gz) = 36c9680e92387507a64d599cf3e464328857efa84fc971a93dca0b3c1ffd8ace
SIZE (gitlabhq-gitlabhq-v10.8.4_GH0.tar.gz) = 48448250

22
www/gitlab/files/patch-Gemfile
View File

@ -1,4 +1,4 @@
--- Gemfile.orig 2018-05-28 11:47:11 UTC
--- Gemfile.orig 2018-06-20 17:48:20 UTC
+++ Gemfile
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for']
@ -9,7 +9,7 @@
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.27'
@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1'
@@ -118,7 +118,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
@ -18,7 +18,7 @@
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
@@ -169,7 +169,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
@ -27,7 +27,7 @@
# Colored output to console
gem 'rainbow', '~> 2.2'
@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0'
@@ -222,7 +222,7 @@ gem 'kubeclient', '~> 3.0'
gem 'd3_rails', '~> 3.5.0'
# Sanitize user input
@ -36,16 +36,16 @@
gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input
@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1'
@@ -284,7 +284,7 @@ gem 'batch-loader', '~> 1.2.1'
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.1.0', group: :mysql
+gem 'peek-mysql2', '>= 1.1.0', group: :mysql
gem 'peek-performance_bar', '~> 1.3.0'
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
gem 'peek-redis', '~> 1.2.0'
@@ -292,99 +292,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics
group :metrics do
@ -54,7 +54,7 @@
- gem 'influxdb', '~> 0.2', require: false
-
# Prometheus
gem 'prometheus-client-mmap', '~> 0.9.1'
gem 'prometheus-client-mmap', '~> 0.9.3'
gem 'raindrops', '~> 0.18'
end
@ -135,6 +135,7 @@
- gem 'email_spec', '~> 1.6.0'
- gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
- gem 'rails-controller-testing' if rails5? # Rails5 only gem.
- gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
- gem 'sham_rack', '~> 1.3.6'
- gem 'concurrent-ruby', '~> 1.0.5'
@ -144,8 +145,3 @@
gem 'octokit', '~> 4.8'
gem 'mail_room', '~> 0.9.1'
@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7'
# Asset synchronization
gem 'asset_sync', '~> 2.2.0'
+

19
www/gitlab/files/patch-config_gitlab.yml.example
View File

@ -1,6 +1,15 @@
--- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC
--- config/gitlab.yml.example.orig 2018-06-06 20:30:27 UTC
+++ config/gitlab.yml.example
@@ -570,7 +570,7 @@ production: &base
@@ -213,7 +213,7 @@ production: &base
# external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
admin:
- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
+ address: unix:/usr/local/www/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port)
## Mattermost
## For enabling Add to Mattermost button
@@ -572,7 +572,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -9,7 +18,7 @@
# Default Gitaly authentication token. Can be overriden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -588,8 +588,8 @@ production: &base
@@ -590,8 +590,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@ -20,7 +29,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -617,12 +617,12 @@ production: &base
@@ -619,12 +619,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +45,7 @@
# Git over HTTP
upload_pack: true
@@ -643,7 +643,7 @@ production: &base
@@ -645,7 +645,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

4
www/gitlab/files/patch-config_initializers_1__settings.rb
View File

@ -1,6 +1,6 @@
--- config/initializers/1_settings.rb.orig 2018-02-22 10:46:29 UTC
--- config/initializers/1_settings.rb.orig 2018-06-06 20:30:27 UTC
+++ config/initializers/1_settings.rb
@@ -252,12 +252,8 @@ Settings.gitlab['email_subject_suffix']
@@ -125,12 +125,8 @@ Settings.gitlab['email_subject_suffix']
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'

12
www/gitlab/files/patch-lib_tasks_gitlab_setup.rake Normal file
View File

@ -0,0 +1,12 @@
--- lib/tasks/gitlab/setup.rake.orig 2018-06-21 08:18:34 UTC
+++ lib/tasks/gitlab/setup.rake
@@ -1,7 +1,8 @@
namespace :gitlab do
desc "GitLab | Setup production application"
task setup: :gitlab_environment do
- check_gitaly_connection
+ # Remove this check, see https://gitlab.com/gitlab-org/gitlab-ce/issues/47483
+ #check_gitaly_connection
setup_db
end

6
www/gitlab/pkg-message
View File

@ -4,12 +4,12 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.7-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.8-freebsd.md
If you just installed an major upgrade of GitLab, for example you
switched from 10.6.x to 10.7.x, please follow the instructions in the guide at:
switched from 10.7.x to 10.8.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.6-10.7-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.7-10.8-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

617
www/gitlab/pkg-plist
View File

File diff suppressed because it is too large Load Diff