cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r469941 r471208

Browse Source 
Update gitlab to 10.7.3.
For list of changes look here: https://about.gitlab.com/2018/04/22/gitlab-10-7-released/
Please note that gitlab-pages is temporarily removed and will be added later if upstream bug is fixed.
To not update to this version if you require gitlab-pages.
The Gemfile.lock is now generated on gitlab startup, so this should help with Gemfile issues.

Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15314

Applied security upgrade to gitlab 10.7.5.
Fixed bug with wrong path for gitlab-workhouse that should fix artifacts (reported by Felix <mail@felix.flornet.de>). This was fix upstream but is not included in this version yet: https://gitlab.com/gitlab-org/gitlab-ce/issues/46763
Update net/rubygem-grpc to 1.11.1 which is required for gitlab 10.7.5.
Sync dep net/rubygem-grpc with gitlab which uses now 1.11.1.
Added gitlab-pages again to dependencies as the new version builds again.

Reported by:	Felix <mail@felix.flornet.de>
Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D15631

Approved by:	ports-secteam (eadler)
This commit is contained in:
Matthias Fechner 2018-06-05 19:32:49 +00:00
parent e7dfe0d10a
commit 98a2bb9875
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2018Q2/; revision=471809
12 changed files with 646 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/gitaly/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
PORTNAME= gitaly
DISTVERSION= 0.91.0
PORTREVISION= 1
DISTVERSION= 0.96.1
PORTREVISION= 4
CATEGORIES= devel
MAINTAINER= idefix@fechner.net

8
devel/gitaly/files/patch-ruby_Gemfile
View File

@ -1,6 +1,12 @@
--- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC
+++ ruby/Gemfile
@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require:
@@ -8,17 +8,13 @@ gem 'activesupport', '~> 5.0.2'
gem 'rdoc', '~> 4.2'
gem 'gollum-lib', '~> 4.2', require: false
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.10.0'
+gem 'grpc', '~> 1.11.0'
gem 'sentry-raven', '~> 2.7.2', require: false
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE

2
net/rubygem-grpc/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= grpc
PORTVERSION= 1.10.0
PORTVERSION= 1.11.1
CATEGORIES= net rubygems
MASTER_SITES= RG

6
net/rubygem-grpc/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1523377112
SHA256 (rubygem/grpc-1.10.0.gem) = 0235e5e5cff0253c53f022bbfa6929a4c4ef97db5900122981b7375a25c49b9f
SIZE (rubygem/grpc-1.10.0.gem) = 2769408
TIMESTAMP = 1527758749
SHA256 (rubygem/grpc-1.11.1.gem) = 890ee82183285ac228c13122ee8d0f17e29f055c102d75a5d7bf31364b25729c
SIZE (rubygem/grpc-1.11.1.gem) = 2883584

74
www/gitlab/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab
PORTVERSION= 10.6.5
PORTVERSION= 10.7.5
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@ -25,10 +25,10 @@ BUILD_DEPENDS= gem:devel/ruby-gems
# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
# for the options
RUN_DEPENDS= git>=2.16.2:devel/git \
gitlab-shell>=6.0.4:devel/gitlab-shell \
gitlab-workhorse>=4.0.0:www/gitlab-workhorse \
gitaly>=0.91.0:devel/gitaly \
gitlab-pages>=0.7.1:www/gitlab-pages \
gitlab-shell>=7.1.2:devel/gitlab-shell \
gitlab-workhorse>=4.1.0:www/gitlab-workhorse \
gitaly>=0.96.1:devel/gitaly \
gitlab-pages>=0.9.1:www/gitlab-pages \
redis>=2.8.23:databases/redis \
npm>=4.3.0:www/npm \
yarn>=0.17.0:www/yarn \
@ -36,26 +36,26 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \
rubygem-responders>=2.0:www/rubygem-responders \
rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \
rubygem-rugged>=0.26.0:devel/rubygem-rugged \
rubygem-default_value_for30>=3.0.5:devel/rubygem-default_value_for30 \
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-doorkeeper42>=4.2:security/rubygem-doorkeeper42 \
rubygem-doorkeeper-openid_connect12>=1.2.0:security/rubygem-doorkeeper-openid_connect12 \
rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \
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 \
rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \
rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \
rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \
rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \
rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \
rubygem-omniauth-google-oauth2>=0.5.2:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-google-oauth2>=0.5.3: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-saml17>=1.7.0:security/rubygem-omniauth-saml17 \
rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \
rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \
rubygem-omniauth-twitter12>=1.2.0:net/rubygem-omniauth-twitter12 \
rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \
rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \
rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \
rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \
@ -64,7 +64,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-akismet>=2.0:devel/rubygem-akismet \
rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \
rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted30>=3.0.0:security/rubygem-attr_encrypted30 \
rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \
rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \
rubygem-browser>=2.2:www/rubygem-browser \
@ -82,17 +82,17 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \
rubygem-carrierwave>=1.1:www/rubygem-carrierwave \
rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \
rubygem-fog-aws1>=1.4:net/rubygem-fog-aws1 \
rubygem-fog-aws>=2.0.1:net/rubygem-fog-aws \
rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \
rubygem-fog-google0>=0.5:net/rubygem-fog-google0 \
rubygem-fog-google>=1.3.3:net/rubygem-fog-google \
rubygem-fog-local>=0.3:net/rubygem-fog-local \
rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \
rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \
rubygem-fog-aliyun>=0.2.0:net/rubygem-fog-aliyun \
rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \
rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \
rubygem-unf>=0.1.4:textproc/rubygem-unf \
rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \
rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \
rubygem-html-pipeline>=2.7.1:textproc/rubygem-html-pipeline \
rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \
rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \
rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \
@ -102,8 +102,8 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
rubygem-creole>=0.5.0:textproc/rubygem-creole \
rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \
rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-plantuml007>=0.0.7:textproc/rubygem-asciidoctor-plantuml007 \
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-truncato>=0.7.9:textproc/rubygem-truncato \
rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \
@ -111,8 +111,8 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \
rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \
rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \
rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \
rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \
rubygem-state_machines-activerecord>=0.5.1:databases/rubygem-state_machines-activerecord \
rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq>=5.0.0:devel/rubygem-sidekiq \
rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \
rubygem-redis-namespace15>=1.5.2:databases/rubygem-redis-namespace15 \
@ -133,12 +133,12 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
rubygem-asana>=0.6.0:www/rubygem-asana \
rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
rubygem-kubeclient22>=2.2.0:www/rubygem-kubeclient22 \
rubygem-kubeclient>=3.0.0:www/rubygem-kubeclient \
rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
rubygem-sanitize>=2.0:textproc/rubygem-sanitize \
rubygem-babosa>=1.0.2:textproc/rubygem-babosa \
rubygem-loofah>=2.2:textproc/rubygem-loofah \
rubygem-licensee8>=8.7:devel/rubygem-licensee8 \
rubygem-licensee8>=8.9:devel/rubygem-licensee8 \
rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \
rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \
rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \
@ -157,53 +157,50 @@ RUN_DEPENDS= git>=2.16.2:devel/git \
rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
rubygem-gon61>=6.1.0:www/rubygem-gon61 \
rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \
rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \
rubygem-request_store>=1.3:devel/rubygem-request_store \
rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
rubygem-base32>=0.3.0:converters/rubygem-base32 \
rubygem-sentry-raven>=2.5.3:devel/rubygem-sentry-raven \
rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \
rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \
rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \
rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
rubygem-gettext_i18n_rails_js12>=1.2.0:devel/rubygem-gettext_i18n_rails_js12 \
rubygem-gettext_i18n_rails_js>=1.3:devel/rubygem-gettext_i18n_rails_js \
rubygem-gettext>=3.2.2:devel/rubygem-gettext \
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-host>=1.0.0:devel/rubygem-peek-host \
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-octokit46>=4.6.2:net/rubygem-octokit46 \
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 \
rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-ruby-prof016>=0.16.2:devel/rubygem-ruby-prof016 \
rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \
rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \
rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
rubygem-net-ssh41>=4.1.0:security/rubygem-net-ssh41 \
rubygem-net-ssh>=4.2.0:security/rubygem-net-ssh \
rubygem-sshkey>=1.9.0:security/rubygem-sshkey \
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-proto088>=0.88.0:net/rubygem-gitaly-proto088 \
rubygem-grpc>=1.10.0:net/rubygem-grpc \
rubygem-gitaly-proto096>=0.96.0:net/rubygem-gitaly-proto096 \
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 \
rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \
rubygem-flipper011>=0.11.0:devel/rubygem-flipper011 \
rubygem-flipper-active_record011>=0.11.0:databases/rubygem-flipper-active_record011 \
rubygem-flipper-active_support_cache_store011>=0.11.0:devel/rubygem-flipper-active_support_cache_store011 \
rubygem-flipper013>=0.13.0:devel/rubygem-flipper013 \
rubygem-flipper-active_record013>=0.13.0:databases/rubygem-flipper-active_record013 \
rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \
rubygem-lograge>=0.5:www/rubygem-lograge \
rubygem-grape_logging>=1.7:devel/rubygem-grape_logging \
rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 \
rubygem-rinku>=1.7.3:www/rubygem-rinku
rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220
PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \
rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg
@ -243,6 +240,7 @@ 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/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1525161156
SHA256 (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 47fc8de80d7154150b11457b28920efdc93f4bc583017f6a13b4b6ba4fe8ee35
SIZE (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 46312621
TIMESTAMP = 1527763488
SHA256 (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 69829e44acec5622b98a957874bd0426779540866bfd5ac6637b2bb331101f30
SIZE (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 47807879

14
www/gitlab/files/gitlab.in
View File

@ -88,6 +88,20 @@ test -f /etc/default/gitlab && . /etc/default/gitlab
# Switch to the app_user if it is not he/she who is running the script.
if [ "$USER" != "$app_user" ]; then
# Regenerate the Gemfile.lock for all related products
echo "Regenerate Gitlab Gemfile.lock"
rm -f "${app_root}"/Gemfile.lock
if ! su -l ${app_user} -c "cd ${app_root} && /usr/local/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
exit 1
fi
echo "Regenerate Gitaly Gemfile.lock"
rm -f "${gitaly_dir}"/ruby/Gemfile.lock
if ! su -l root -c "cd ${gitaly_dir}/ruby && /usr/local/bin/bundle install --local --quiet"; then
echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/"
exit 1
fi
eval su - "$app_user" -c $(echo \")/usr/local/etc/rc.d/gitlab "$@"$(echo \"); exit;
fi

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

@ -1,33 +1,24 @@
--- Gemfile.orig 2018-04-09 20:57:26 UTC
--- Gemfile.orig 2018-05-28 11:47:11 UTC
+++ Gemfile
@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.0.0'
@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', gem_versions['default_value_for']
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
+gem 'mysql2', '>= 0.4.10', group: :mysql
gem 'pg', '~> 0.18.2', group: :postgres
gem 'rugged', '~> 0.26.0'
@@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'rugged', '~> 0.27'
@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1'
gem 'fog-aliyun', '~> 0.2.0'
# for Google storage
-gem 'google-api-client', '~> 0.13.6'
+gem 'google-api-client', '>= 0.13.6'
-gem 'google-api-client', '~> 0.19.8'
+gem 'google-api-client', '>= 0.19.8'
# for aws storage
gem 'unf', '~> 0.1.4'
@@ -149,7 +149,7 @@ group :unicorn do
end
# State machine
-gem 'state_machines-activerecord', '~> 0.4.0'
+gem 'state_machines-activerecord', '>= 0.4.0'
# Issue tags
gem 'acts-as-taggable-on', '~> 4.0'
@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req
gem 'rufus-scheduler', '~> 3.4'
# HTTP requests
@ -36,7 +27,7 @@
# Colored output to console
gem 'rainbow', '~> 2.2'
@@ -214,7 +214,7 @@ gem 'kubeclient', '~> 2.2.0'
@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0'
gem 'd3_rails', '~> 3.5.0'
# Sanitize user input
@ -45,25 +36,16 @@
gem 'babosa', '~> 1.0.2'
# Sanitizes SVG input
@@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1'
gem 'base32', '~> 0.3.0'
# Sentry integration
-gem 'sentry-raven', '~> 2.5.3'
+gem 'sentry-raven', '>= 2.5.3'
gem 'premailer-rails', '~> 1.9.7'
@@ -281,7 +281,7 @@ gem 'batch-loader', '~> 1.2.1'
@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1'
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
gem 'peek-host', '~> 1.0.0'
-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'
@@ -290,97 +290,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3'
# Metrics
group :metrics do
@ -77,8 +59,8 @@
end
-group :development do
- gem 'foreman', '~> 0.78.0'
- gem 'brakeman', '~> 3.6.0', require: false
- gem 'foreman', '~> 0.84.0'
- gem 'brakeman', '~> 4.2', require: false
-
- gem 'letter_opener_web', '~> 1.3.0'
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
@ -137,13 +119,15 @@
- gem 'benchmark-ips', '~> 2.3.0', require: false
-
- gem 'license_finder', '~> 3.1', require: false
- gem 'knapsack', '~> 1.11.0'
- gem 'knapsack', '~> 1.16'
-
- gem 'activerecord_sane_schema_dumper', '0.2'
- gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
-
- gem 'stackprof', '~> 0.2.10', require: false
-
- gem 'simple_po_parser', '~> 1.1.2', require: false
-
- gem 'timecop', '~> 0.8.0'
-end
-
-group :test do
@ -151,20 +135,17 @@
- gem 'email_spec', '~> 1.6.0'
- gem 'json-schema', '~> 2.8.0'
- gem 'webmock', '~> 2.3.2'
- gem 'test_after_commit', '~> 1.1'
- 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 'timecop', '~> 0.8.0'
- gem 'concurrent-ruby', '~> 1.0.5'
- gem 'test-prof', '~> 0.2.5'
-end
-
gem 'octokit', '~> 4.6.2'
gem 'octokit', '~> 4.8'
gem 'mail_room', '~> 0.9.1'
@@ -431,3 +345,6 @@ gem 'grape_logging', '~> 1.7'
@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7'
# Asset synchronization
gem 'asset_sync', '~> 2.2.0'
+
+# Make sure this is always present, as it is missing upstream but is required
+gem 'rinku'

11
www/gitlab/files/patch-app_uploaders_object__storage.rb Normal file
View File

@ -0,0 +1,11 @@
--- app/uploaders/object_storage.rb.orig 2018-05-31 10:45:20 UTC
+++ app/uploaders/object_storage.rb
@@ -11,7 +11,7 @@ module ObjectStorage
ObjectStorageUnavailable = Class.new(StandardError)
DIRECT_UPLOAD_TIMEOUT = 4.hours
- TMP_UPLOAD_PATH = 'tmp/upload'.freeze
+ TMP_UPLOAD_PATH = 'tmp/uploads'.freeze
module Store
LOCAL = 1

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

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2018-02-25 17:42:24 UTC
--- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC
+++ config/gitlab.yml.example
@@ -517,7 +517,7 @@ production: &base
@@ -570,7 +570,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -9,7 +9,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.
@@ -535,8 +535,8 @@ production: &base
@@ -588,8 +588,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@ -20,7 +20,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -564,12 +564,12 @@ production: &base
@@ -617,12 +617,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -36,7 +36,7 @@
# Git over HTTP
upload_pack: true
@@ -590,7 +590,7 @@ production: &base
@@ -643,7 +643,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

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

666
www/gitlab/pkg-plist
View File

File diff suppressed because it is too large Load Diff