mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-02 06:03:50 +00:00
www/gitlab: Update from 9.0.10 to 9.1.7
Changelog: https://github.com/gitlabhq/gitlabhq/blob/v9.1.7/CHANGELOG.md Reviewed by: Matthias Fechner <idefix@fechner.net>
This commit is contained in:
Torsten Zuehlsdorff
parent
bcd65ac40a
commit
2233200739
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=445153
@ -2,9 +2,8 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= gitlab
|
||||
PORTVERSION= 9.0.10
|
||||
PORTVERSION= 9.1.7
|
||||
DISTVERSIONPREFIX= v
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= www devel
|
||||
|
||||
MAINTAINER= tz@FreeBSD.org
|
||||
@ -26,8 +25,8 @@ 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.8.4:devel/git \
|
||||
gitlab-shell>=5.0.0:devel/gitlab-shell\
|
||||
gitlab-workhorse>=1.4.2:www/gitlab-workhorse \
|
||||
gitlab-shell>=5.0.2:devel/gitlab-shell\
|
||||
gitlab-workhorse>=1.4.3:www/gitlab-workhorse \
|
||||
redis>=2.8.23:databases/redis \
|
||||
npm>=4.3.0:www/npm \
|
||||
yarn>=0.17.0:www/yarn \
|
||||
@ -36,7 +35,8 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
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.24:devel/rubygem-rugged \
|
||||
rubygem-rugged>=0.25.1.1:devel/rubygem-rugged \
|
||||
rubygem-faraday>=0.11.0:www/rubygem-faraday \
|
||||
rubygem-devise>=4.2:devel/rubygem-devise \
|
||||
rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \
|
||||
rubygem-doorkeeper-openid_connect>=1.1.0:security/rubygem-doorkeeper-openid_connect \
|
||||
@ -66,7 +66,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
rubygem-browser>=2.2:www/rubygem-browser \
|
||||
rubygem-gitlab_omniauth-ldap1>=1.2.1:net/rubygem-gitlab_omniauth-ldap1 \
|
||||
rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \
|
||||
rubygem-gollum-rugged_adapter>=0.4.2:www/rubygem-gollum-rugged_adapter \
|
||||
rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \
|
||||
rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \
|
||||
rubygem-grape>=0.19.0:devel/rubygem-grape \
|
||||
rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \
|
||||
@ -108,6 +108,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
rubygem-sidekiq-cron04>=0.4.4:devel/rubygem-sidekiq-cron04 \
|
||||
rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \
|
||||
rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \
|
||||
rubygem-rufus-scheduler>=3.1.10:devel/rubygem-rufus-scheduler \
|
||||
rubygem-httparty>=0.13.3:www/rubygem-httparty \
|
||||
rubygem-rainbow>=2.1.0:devel/rubygem-rainbow \
|
||||
rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \
|
||||
@ -120,7 +121,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \
|
||||
rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \
|
||||
rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \
|
||||
rubygem-asana>=0.4.0:www/rubygem-asana \
|
||||
rubygem-asana>=0.6.0:www/rubygem-asana \
|
||||
rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \
|
||||
rubygem-kubeclient>=2.2.0:www/rubygem-kubeclient \
|
||||
rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \
|
||||
@ -136,7 +137,7 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
rubygem-oj2>=2.17.4:devel/rubygem-oj2 \
|
||||
rubygem-chronic>=0.10.2:devel/rubygem-chronic \
|
||||
rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
|
||||
rubygem-webpack-rails>=0.9.9:www/rubygem-webpack-rails \
|
||||
rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \
|
||||
rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
|
||||
rubygem-sass-rails5>=5.0.6:textproc/rubygem-sass-rails5 \
|
||||
rubygem-coffee-rails4>=4.1.0:devel/rubygem-coffee-rails4 \
|
||||
@ -153,19 +154,20 @@ RUN_DEPENDS= git>=2.8.4:devel/git \
|
||||
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
|
||||
rubygem-net-ssh>=3.0.1:security/rubygem-net-ssh \
|
||||
rubygem-base32>=0.3.2:converters/rubygem-base32 \
|
||||
rubygem-sentry-raven>=2.0.0:devel/rubygem-sentry-raven \
|
||||
rubygem-sentry-raven>=2.4.0:devel/rubygem-sentry-raven \
|
||||
rubygem-premailer-rails>=1.9.0:mail/rubygem-premailer-rails \
|
||||
rubygem-octokit>=4.6.2: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-prof>=0.16.2:devel/rubygem-ruby-prof \
|
||||
rubygem-oauth212>=1.2.0:net/rubygem-oauth212 \
|
||||
rubygem-oauth2>=1.3.0:net/rubygem-oauth212 \
|
||||
rubygem-paranoia>=2.2:databases/rubygem-paranoia \
|
||||
rubygem-health_check>=2.6.0:devel/rubygem-health_check \
|
||||
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
|
||||
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
|
||||
rubygem-gitaly>=0.2.1:net/rubygem-gitaly \
|
||||
rubygem-gitaly>=0.5.0:net/rubygem-gitaly \
|
||||
rubygem-toml-rb>=0.3.15:www/rubygem-toml-rb \
|
||||
rubygem-rinku>=1.7.3:www/rubygem-rinku
|
||||
|
||||
PGSQL_RUN_DEPENDS= rubygem-pg>=0.18.2:databases/rubygem-pg
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1497354650
|
||||
SHA256 (gitlabhq-gitlabhq-v9.0.10_GH0.tar.gz) = 99422056f86a8ada3177cfd4e06985ef7db51494940bebcc08886b61a5221e48
|
||||
SIZE (gitlabhq-gitlabhq-v9.0.10_GH0.tar.gz) = 26359584
|
||||
TIMESTAMP = 1498552753
|
||||
SHA256 (gitlabhq-gitlabhq-v9.1.7_GH0.tar.gz) = 195f39ea7e3c0714df13403b2cc6311fecc437bf28b9f9cc619dd5b3a49634b0
|
||||
SIZE (gitlabhq-gitlabhq-v9.1.7_GH0.tar.gz) = 30511727
|
||||
|
||||
@ -390,7 +390,7 @@ restart_gitlab(){
|
||||
### Finally the input handling.
|
||||
|
||||
case "$1" in
|
||||
start|quietstart)
|
||||
start|quietstart|faststart)
|
||||
start_gitlab
|
||||
;;
|
||||
stop|faststop)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- Gemfile.orig 2017-06-07 20:58:14 UTC
|
||||
--- Gemfile.orig 2017-06-07 20:48:31 UTC
|
||||
+++ Gemfile
|
||||
@@ -1,46 +1,41 @@
|
||||
@@ -1,48 +1,43 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
-gem 'rails', '4.2.8'
|
||||
@ -21,8 +21,10 @@
|
||||
-gem 'pg', '~> 0.18.2', group: :postgres
|
||||
+gem 'default_value_for', '>= 3.0.0'
|
||||
|
||||
-gem 'rugged', '~> 0.24.0'
|
||||
+gem 'rugged', '>= 0.24.0'
|
||||
gem 'rugged', '~> 0.25.1.1'
|
||||
|
||||
-gem 'faraday', '~> 0.11.0'
|
||||
+gem 'faraday', '>= 0.11.0'
|
||||
|
||||
# Authentication libraries
|
||||
gem 'devise', '~> 4.2'
|
||||
@ -56,8 +58,8 @@
|
||||
gem 'akismet', '~> 2.0'
|
||||
|
||||
# Two-factor authentication
|
||||
@@ -66,7 +61,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
|
||||
gem 'gollum-rugged_adapter', '~> 0.4.2', require: false
|
||||
@@ -68,7 +63,7 @@ gem 'gollum-lib', '~> 4.2', require: fal
|
||||
gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
|
||||
|
||||
# Language detection
|
||||
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
|
||||
@ -65,7 +67,7 @@
|
||||
|
||||
# API
|
||||
gem 'grape', '~> 0.19.0'
|
||||
@@ -77,13 +72,13 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
|
||||
@@ -79,13 +74,13 @@ gem 'rack-cors', '~> 0.4.0', require: 'r
|
||||
gem 'kaminari', '~> 0.17.0'
|
||||
|
||||
# HAML
|
||||
@ -82,7 +84,7 @@
|
||||
|
||||
# for backups
|
||||
gem 'fog-aws', '~> 0.9'
|
||||
@@ -94,7 +89,7 @@ gem 'fog-openstack', '~> 0.1'
|
||||
@@ -96,7 +91,7 @@ gem 'fog-openstack', '~> 0.1'
|
||||
gem 'fog-rackspace', '~> 0.1.1'
|
||||
|
||||
# for Google storage
|
||||
@ -91,7 +93,7 @@
|
||||
|
||||
# for aws storage
|
||||
gem 'unf', '~> 0.1.4'
|
||||
@@ -104,34 +99,34 @@ gem 'seed-fu', '~> 2.3.5'
|
||||
@@ -106,34 +101,34 @@ gem 'seed-fu', '~> 2.3.5'
|
||||
|
||||
# Markdown and HTML processing
|
||||
gem 'html-pipeline', '~> 1.11.0'
|
||||
@ -134,9 +136,13 @@
|
||||
# Run events after state machine commits
|
||||
gem 'after_commit_queue', '~> 1.3.0'
|
||||
|
||||
@@ -145,17 +140,17 @@ gem 'redis-namespace', '~> 1.5.2'
|
||||
@@ -147,20 +142,20 @@ gem 'redis-namespace', '~> 1.5.2'
|
||||
gem 'sidekiq-limit_fetch', '~> 3.4'
|
||||
|
||||
# Cron Parser
|
||||
-gem 'rufus-scheduler', '~> 3.1.10'
|
||||
+gem 'rufus-scheduler', '>= 3.1.10'
|
||||
|
||||
# HTTP requests
|
||||
-gem 'httparty', '~> 0.13.3'
|
||||
+gem 'httparty', '>= 0.13.3'
|
||||
@ -155,7 +161,7 @@
|
||||
|
||||
# Cache
|
||||
gem 'redis-rails', '~> 5.0.1'
|
||||
@@ -168,7 +163,7 @@ gem 'connection_pool', '~> 2.0'
|
||||
@@ -173,7 +168,7 @@ gem 'connection_pool', '~> 2.0'
|
||||
gem 'hipchat', '~> 1.5.0'
|
||||
|
||||
# JIRA integration
|
||||
@ -164,14 +170,7 @@
|
||||
|
||||
# Flowdock integration
|
||||
gem 'gitlab-flowdock-git-hook', '~> 1.0.1'
|
||||
@@ -180,13 +175,13 @@ gem 'gemnasium-gitlab-service', '~> 0.2'
|
||||
gem 'slack-notifier', '~> 1.5.1'
|
||||
|
||||
# Asana integration
|
||||
-gem 'asana', '~> 0.4.0'
|
||||
+gem 'asana', '>= 0.4.0'
|
||||
|
||||
# FogBugz integration
|
||||
@@ -191,7 +186,7 @@ gem 'asana', '~> 0.6.0'
|
||||
gem 'ruby-fogbugz', '~> 0.2.1'
|
||||
|
||||
# Kubernetes integration
|
||||
@ -180,7 +179,7 @@
|
||||
|
||||
# d3
|
||||
gem 'd3_rails', '~> 3.5.0'
|
||||
@@ -195,7 +190,7 @@ gem 'd3_rails', '~> 3.5.0'
|
||||
@@ -200,7 +195,7 @@ gem 'd3_rails', '~> 3.5.0'
|
||||
gem 'underscore-rails', '~> 1.8.0'
|
||||
|
||||
# Sanitize user input
|
||||
@ -189,7 +188,7 @@
|
||||
gem 'babosa', '~> 1.0.2'
|
||||
|
||||
# Sanitizes SVG input
|
||||
@@ -205,7 +200,7 @@ gem 'loofah', '~> 2.0.3'
|
||||
@@ -210,7 +205,7 @@ gem 'loofah', '~> 2.0.3'
|
||||
gem 'licensee', '~> 8.7.0'
|
||||
|
||||
# Protect against bruteforcing
|
||||
@ -198,10 +197,10 @@
|
||||
|
||||
# Ace editor
|
||||
gem 'ace-rails-ap', '~> 4.1.0'
|
||||
@@ -224,122 +219,41 @@ gem 'chronic', '~> 0.10.2'
|
||||
@@ -229,122 +224,41 @@ gem 'chronic', '~> 0.10.2'
|
||||
gem 'chronic_duration', '~> 0.10.6'
|
||||
|
||||
gem 'webpack-rails', '~> 0.9.9'
|
||||
gem 'webpack-rails', '~> 0.9.10'
|
||||
-gem 'rack-proxy', '~> 0.6.0'
|
||||
+gem 'rack-proxy', '>= 0.6.0'
|
||||
|
||||
@ -228,8 +227,8 @@
|
||||
gem 'base32', '~> 0.3.0'
|
||||
|
||||
# Sentry integration
|
||||
-gem 'sentry-raven', '~> 2.0.0'
|
||||
+gem 'sentry-raven', '>= 2.0.0'
|
||||
-gem 'sentry-raven', '~> 2.4.0'
|
||||
+gem 'sentry-raven', '>= 2.4.0'
|
||||
|
||||
gem 'premailer-rails', '~> 1.9.0'
|
||||
|
||||
@ -242,15 +241,13 @@
|
||||
-
|
||||
-group :development do
|
||||
- gem 'foreman', '~> 0.78.0'
|
||||
- gem 'brakeman', '~> 3.4.0', require: false
|
||||
- gem 'brakeman', '~> 3.6.0', require: false
|
||||
-
|
||||
- gem 'letter_opener_web', '~> 1.3.0'
|
||||
- gem 'bullet', '~> 5.2.0', require: false
|
||||
- gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
|
||||
- gem 'web-console', '~> 2.0'
|
||||
-
|
||||
- # Better errors handler
|
||||
- gem 'better_errors', '~> 1.0.1'
|
||||
- gem 'better_errors', '~> 2.1.0'
|
||||
- gem 'binding_of_caller', '~> 0.7.2'
|
||||
-
|
||||
- # thin instead webrick
|
||||
@ -258,6 +255,7 @@
|
||||
-end
|
||||
-
|
||||
-group :development, :test do
|
||||
- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET']
|
||||
- gem 'pry-byebug', '~> 3.4.1', platform: :mri
|
||||
- gem 'pry-rails', '~> 0.3.4'
|
||||
-
|
||||
@ -282,16 +280,16 @@
|
||||
- gem 'capybara-screenshot', '~> 1.0.0'
|
||||
- gem 'poltergeist', '~> 1.9.0'
|
||||
-
|
||||
- gem 'spring', '~> 1.7.0'
|
||||
- gem 'spring', '~> 2.0.0'
|
||||
- gem 'spring-commands-rspec', '~> 1.0.4'
|
||||
- gem 'spring-commands-spinach', '~> 1.1.0'
|
||||
-
|
||||
- gem 'rubocop', '~> 0.47.1', require: false
|
||||
- gem 'rubocop-rspec', '~> 1.12.0', require: false
|
||||
- gem 'rubocop-rspec', '~> 1.15.0', require: false
|
||||
- gem 'scss_lint', '~> 0.47.0', require: false
|
||||
- gem 'haml_lint', '~> 0.21.0', require: false
|
||||
- gem 'simplecov', '0.12.0', require: false
|
||||
- gem 'flay', '~> 2.6.1', require: false
|
||||
- gem 'simplecov', '~> 0.14.0', require: false
|
||||
- gem 'flay', '~> 2.8.0', require: false
|
||||
- gem 'bundler-audit', '~> 0.5.0', require: false
|
||||
-
|
||||
- gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||
@ -308,10 +306,11 @@
|
||||
- gem 'shoulda-matchers', '~> 2.8.0', require: false
|
||||
- gem 'email_spec', '~> 1.6.0'
|
||||
- gem 'json-schema', '~> 2.6.2'
|
||||
- gem 'webmock', '~> 1.21.0'
|
||||
- gem 'webmock', '~> 1.24.0'
|
||||
- gem 'test_after_commit', '~> 1.1'
|
||||
- gem 'sham_rack', '~> 1.3.6'
|
||||
- gem 'timecop', '~> 0.8.0'
|
||||
- gem 'concurrent-ruby', '~> 1.0.5'
|
||||
-end
|
||||
-
|
||||
-gem 'octokit', '~> 4.6.2'
|
||||
@ -326,14 +325,16 @@
|
||||
gem 'ruby-prof', '~> 0.16.2'
|
||||
|
||||
# OAuth
|
||||
-gem 'oauth2', '~> 1.2.0'
|
||||
+gem 'oauth2', '>= 1.2.0'
|
||||
-gem 'oauth2', '~> 1.3.0'
|
||||
+gem 'oauth2', '>= 1.3.0'
|
||||
|
||||
# Soft deletion
|
||||
gem 'paranoia', '~> 2.2'
|
||||
@@ -353,3 +267,5 @@ gem 'sys-filesystem', '~> 1.1.6'
|
||||
|
||||
@@ -359,4 +273,6 @@ gem 'sys-filesystem', '~> 1.1.6'
|
||||
# Gitaly GRPC client
|
||||
gem 'gitaly', '~> 0.2.1'
|
||||
gem 'gitaly', '~> 0.5.0'
|
||||
|
||||
-gem 'toml-rb', '~> 0.3.15', require: false
|
||||
+gem 'toml-rb', '>= 0.3.15', require: false
|
||||
+
|
||||
+gem 'rinku'
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
--- config/gitlab.yml.example.orig 2017-06-07 20:58:14 UTC
|
||||
--- config/gitlab.yml.example.orig 2017-06-07 20:48:31 UTC
|
||||
+++ config/gitlab.yml.example
|
||||
@@ -472,7 +472,7 @@ production: &base
|
||||
@@ -463,8 +463,8 @@ production: &base
|
||||
# real path not the symlink.
|
||||
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)
|
||||
+ path: /usr/home/git/repositories/
|
||||
+ gitaly_address: unix:/usr/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port)
|
||||
|
||||
## Backup settings
|
||||
backup:
|
||||
@@ -499,12 +499,12 @@ production: &base
|
||||
@@ -491,12 +491,12 @@ production: &base
|
||||
|
||||
## GitLab Shell settings
|
||||
gitlab_shell:
|
||||
@ -25,7 +27,7 @@
|
||||
|
||||
# Git over HTTP
|
||||
upload_pack: true
|
||||
@@ -517,7 +517,7 @@ production: &base
|
||||
@@ -509,7 +509,7 @@ production: &base
|
||||
# CAUTION!
|
||||
# Use the default values unless you really know what you are doing
|
||||
git:
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
--- config/initializers/1_settings.rb.orig 2017-06-07 20:58:14 UTC
|
||||
--- config/initializers/1_settings.rb.orig 2017-06-07 20:48:31 UTC
|
||||
+++ config/initializers/1_settings.rb
|
||||
@@ -203,12 +203,8 @@ Settings.gitlab['email_subject_suffix']
|
||||
Settings.gitlab['base_url'] ||= Settings.send(:build_base_gitlab_url)
|
||||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||
@@ -215,12 +215,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'
|
||||
-Settings.gitlab['user_home'] ||= begin
|
||||
- Etc.getpwnam(Settings.gitlab['user']).dir
|
||||
@ -14,4 +14,4 @@
|
||||
+Settings.gitlab['time_zone'] ||= nil
|
||||
Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
|
||||
Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil?
|
||||
Settings.gitlab['restricted_visibility_levels'] = Settings.send(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
|
||||
Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], [])
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
--- config/initializers/8_gitaly.rb.orig 2017-06-07 20:58:14 UTC
|
||||
+++ config/initializers/8_gitaly.rb
|
||||
@@ -1,2 +1 @@
|
||||
# Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution.
|
||||
-Gitlab::GitalyClient.channel unless Rails.env.test?
|
||||
@ -1,4 +1,4 @@
|
||||
--- lib/support/nginx/gitlab.orig 2017-06-07 20:58:14 UTC
|
||||
--- lib/support/nginx/gitlab.orig 2017-06-07 20:48:31 UTC
|
||||
+++ lib/support/nginx/gitlab
|
||||
@@ -17,7 +17,7 @@
|
||||
## See installation.md#using-https for additional HTTPS configuration details.
|
||||
@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
map $http_upgrade $connection_upgrade_gitlab {
|
||||
@@ -70,7 +70,7 @@ server {
|
||||
@@ -77,7 +77,7 @@ server {
|
||||
error_page 502 /502.html;
|
||||
error_page 503 /503.html;
|
||||
location ~ ^/(404|422|500|502|503)\.html$ {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
--- lib/support/nginx/gitlab-ssl.orig 2017-06-07 20:58:14 UTC
|
||||
--- lib/support/nginx/gitlab-ssl.orig 2017-06-07 20:48:31 UTC
|
||||
+++ lib/support/nginx/gitlab-ssl
|
||||
@@ -21,7 +21,7 @@
|
||||
## See installation.md#using-https for additional HTTPS configuration details.
|
||||
@ -9,7 +9,7 @@
|
||||
}
|
||||
|
||||
map $http_upgrade $connection_upgrade_gitlab_ssl {
|
||||
@@ -118,7 +118,7 @@ server {
|
||||
@@ -125,7 +125,7 @@ server {
|
||||
error_page 502 /502.html;
|
||||
error_page 503 /503.html;
|
||||
location ~ ^/(404|422|500|502|503)\.html$ {
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- lib/tasks/gitlab/check.rake.orig 2017-06-07 20:58:14 UTC
|
||||
+++ lib/tasks/gitlab/check.rake
|
||||
@@ -617,7 +617,7 @@ namespace :gitlab do
|
||||
end
|
||||
|
||||
def sidekiq_process_count
|
||||
- ps_ux, _ = Gitlab::Popen.popen(%w(ps ux))
|
||||
+ ps_ux, _ = Gitlab::Popen.popen(%W(ps wux))
|
||||
ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
|
||||
end
|
||||
end
|
||||
@ -3,7 +3,7 @@ Gitlab was installed successfully.
|
||||
You now need to set up the various components of Gitlab, so please
|
||||
follow the instructions in the guide at:
|
||||
|
||||
http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/9.0-freebsd.md
|
||||
http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/9.1-freebsd.md
|
||||
|
||||
If you just installed an minor upgrade of GitLab please follow
|
||||
the instructions in the guide at:
|
||||
@ -11,6 +11,6 @@ the instructions in the guide at:
|
||||
http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/freebsd_patch_versions.md
|
||||
|
||||
If you just installed an major upgrade of GitLab, for example you
|
||||
switched from 8.17.x to 9.0.x, please follow the instructions in the guide at:
|
||||
switched from 9.0.x to 9.1.x, please follow the instructions in the guide at:
|
||||
|
||||
http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/8.17-to-9.0-freebsd.md
|
||||
http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.0-to-9.1-freebsd.md
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user