mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00
Code Issues Releases Activity

Upgrade to 11.7.0.

Browse Source 
For detailed changelog see:
https://about.gitlab.com/2019/01/22/gitlab-11-7-released/
This commit is contained in:
Matthias Fechner 2019-01-31 14:28:16 +00:00
parent ada79a88ce
commit c8533748ac
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=491734
6 changed files with 276 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
www/gitlab-ce/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 11.6.5
PORTVERSION= 11.7.0
CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
@ -16,13 +16,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
# for the options
MY_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=8.4.3:devel/gitlab-shell \
gitlab-workhorse>=7.6.0:www/gitlab-workhorse \
gitaly>=1.7.1:devel/gitaly \
gitlab-shell>=8.4.4:devel/gitlab-shell \
gitlab-workhorse>=8.0.0:www/gitlab-workhorse \
gitaly>=1.12.1:devel/gitaly \
gitlab-pages>=1.3.1:www/gitlab-pages \
redis>=3.2.12:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
yarn>=1.10.0:www/yarn \
rubygem-rails50>=5.0.7.1:www/rubygem-rails50 \
rubygem-rails-deprecated_sanitizer-rails50>=1.0.3:devel/rubygem-rails-deprecated_sanitizer-rails50 \
rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \
@ -42,7 +42,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-omniauth-facebook4>=4.0.0:net/rubygem-omniauth-facebook4 \
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-google-oauth2>=0.6.0:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \
rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \
rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \
@ -51,7 +51,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \
rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \
rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \
rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \
rubygem-jwt>=2.1.0:www/rubygem-jwt \
rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \
rubygem-akismet>=2.0:devel/rubygem-akismet \
rubygem-devise-two-factor-rails50>=3.0.0:security/rubygem-devise-two-factor-rails50 \
@ -71,7 +71,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails50>=1.0:www/rubygem-kaminari-rails50 \
rubygem-hamlit>=2.8.8:www/rubygem-hamlit \
rubygem-carrierwave>=1.2.3:www/rubygem-carrierwave \
rubygem-carrierwave>=1.3.0:www/rubygem-carrierwave \
rubygem-mini_magick>=0:graphics/rubygem-mini_magick \
rubygem-fog-aws2>=2.0.1:net/rubygem-fog-aws2 \
rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \
@ -99,7 +99,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
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 \
rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \
rubygem-escape_utils>=1.1:textproc/rubygem-escape_utils \
rubygem-icalendar>=0:devel/rubygem-icalendar \
rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \
@ -149,6 +149,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-webpack-rails-rails50>=0.9.10:www/rubygem-webpack-rails-rails50 \
rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
rubygem-sass-rails-rails50>=5.0.6:textproc/rubygem-sass-rails-rails50 \
rubygem-sass>=3.5.0:textproc/rubygem-sass \
rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \
rubygem-addressable>=2.5.2:www/rubygem-addressable \
rubygem-font-awesome-rails-rails50>=4.7:devel/rubygem-font-awesome-rails-rails50 \
@ -162,7 +163,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \
rubygem-premailer-rails19-rails50>=1.9.7:mail/rubygem-premailer-rails19-rails50 \
rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails50>=4.0.9:devel/rubygem-rails-i18n-rails50 \
rubygem-rails-i18n-rails50>=5.1.0:devel/rubygem-rails-i18n-rails50 \
rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
rubygem-gettext_i18n_rails_js-rails50>=1.3:devel/rubygem-gettext_i18n_rails_js-rails50 \
rubygem-gettext>=3.2.2:devel/rubygem-gettext \
@ -186,7 +187,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \
rubygem-sshkey>=1.9.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto>=1.3.0:net/rubygem-gitaly-proto \
rubygem-gitaly-proto>=1.5.0:net/rubygem-gitaly-proto \
rubygem-grpc>=1.15.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf \
@ -211,7 +212,7 @@ MYSQL_DESC= Optional MySQL support
PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \
rubygem-peek-pg-rails50>=1.3.0:databases/rubygem-peek-pg-rails50
MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \
rubygem-peek-mysql2-rails50>=1.1.0:databases/rubygem-peek-mysql2-rails50
rubygem-peek-mysql2-rails50>=1.2.0:databases/rubygem-peek-mysql2-rails50
USE_RUBY= yes
@ -219,7 +220,7 @@ USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
GL_COMMIT= 237bddc6a52fdc8ccb51b024a3048a3233ee43a3
GL_COMMIT= 1d9280e16514e01f02674591634befb8f765e858
USERS= git
GROUPS= git
@ -254,7 +255,6 @@ do-install:
${FIND} ${WRKSRC} -name '*.gitkeep' -delete
${FIND} ${WRKSRC} -name '*.gitignore' -delete
${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
${FIND} ${WRKSRC} -name "Gemfile.rail5.lock" -delete
${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample
${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample

6
www/gitlab-ce/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1548333740
SHA256 (gitlab-org-gitlab-ce-237bddc6a52fdc8ccb51b024a3048a3233ee43a3_GL0.tar.gz) = 12bb09da85da03f7eba2b3f01bda1f61ba9026c392a26b4a3ef97fda0851fa89
SIZE (gitlab-org-gitlab-ce-237bddc6a52fdc8ccb51b024a3048a3233ee43a3_GL0.tar.gz) = 49851914
TIMESTAMP = 1548339325
SHA256 (gitlab-org-gitlab-ce-1d9280e16514e01f02674591634befb8f765e858_GL0.tar.gz) = 71d11bda48e84d519e76432c7f241bfa2a2089b77bbc7769ad4180aa4ab9bf59
SIZE (gitlab-org-gitlab-ce-1d9280e16514e01f02674591634befb8f765e858_GL0.tar.gz) = 50696311

42
www/gitlab-ce/files/patch-Gemfile
View File

@ -1,16 +1,7 @@
--- Gemfile.orig 2019-01-04 23:19:12 UTC
--- Gemfile.orig 2019-01-21 20:21:36 UTC
+++ Gemfile
@@ -5,7 +5,7 @@ end
gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
-gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11'
+gem_versions['rails'] = rails5? ? '5.0.7.1' : '4.2.11'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
# The 2.0.6 version of rack requires monkeypatch to be present in
@@ -35,7 +35,7 @@ else
end
@@ -15,7 +15,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
@ -18,7 +9,7 @@
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.27'
@@ -187,7 +187,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si
@@ -168,7 +168,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
@ -27,15 +18,7 @@
# Colored output to console
gem 'rainbow', '~> 3.0'
@@ -307,101 +307,16 @@ gem 'batch-loader', '~> 1.2.2'
# 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-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
@@ -296,93 +296,9 @@ gem 'peek-redis', '~> 1.2.0'
# Metrics
group :metrics do
@ -65,13 +48,13 @@
-group :development, :test do
- gem 'bootsnap', '~> 1.3'
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
- gem 'pry-byebug', '~> 3.4.1', platform: :mri
- gem 'pry-byebug', '~> 3.5.1', platform: :mri
- gem 'pry-rails', '~> 0.3.4'
-
- gem 'awesome_print', require: false
- gem 'fuubar', '~> 2.2.0'
-
- gem 'database_cleaner', '~> 1.5.0'
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
- gem 'rspec-retry', '~> 0.4.5'
@ -80,13 +63,13 @@
- gem 'rspec-parameterized', require: false
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.7.0'
- gem 'minitest', '~> 5.11.0'
-
- # Generate Fake data
- gem 'ffaker', '~> 2.10'
-
- gem 'capybara', '~> 2.15'
- gem 'capybara-screenshot', '~> 1.0.0'
- gem 'capybara', '~> 2.16.1'
- gem 'capybara-screenshot', '~> 1.0.18'
- gem 'selenium-webdriver', '~> 3.12'
-
- gem 'spring', '~> 2.0.0'
@ -107,7 +90,7 @@
- gem 'license_finder', '~> 5.4', require: false
- gem 'knapsack', '~> 1.17'
-
- gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
- gem 'activerecord_sane_schema_dumper', '1.0'
-
- gem 'stackprof', '~> 0.2.10', require: false
-
@ -121,8 +104,7 @@
- gem 'email_spec', '~> 2.2.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 'rails-controller-testing'
- gem 'sham_rack', '~> 1.3.6'
- gem 'concurrent-ruby', '~> 1.1'
- gem 'test-prof', '~> 0.2.5'

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

@ -1,4 +1,4 @@
--- config/gitlab.yml.example.orig 2018-12-21 14:23:37 UTC
--- config/gitlab.yml.example.orig 2019-01-21 20:21:36 UTC
+++ config/gitlab.yml.example
@@ -231,7 +231,7 @@ production: &base
# external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
@ -23,9 +23,9 @@
storages: # You must have at least a `default` storage path.
default:
- path: /home/git/repositories/
- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
+ path: /usr/home/git/repositories/
+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings

6
www/gitlab-ce/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/11.6-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.7-freebsd.md
If you just installed an major upgrade of GitLab, for example you
switched from 11.5.x to 11.6.x, please follow the instructions in the guide at:
switched from 11.6.x to 11.7.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.5-11.6-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.6-11.7-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

301
www/gitlab-ce/pkg-plist
View File

File diff suppressed because it is too large Load Diff