From owner-svn-ports-head@freebsd.org Tue Apr 23 08:27:16 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B0DE159292F; Tue, 23 Apr 2019 08:27:16 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E0528955EE; Tue, 23 Apr 2019 08:27:15 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B51F721D54; Tue, 23 Apr 2019 08:27:15 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3N8RFvD016976; Tue, 23 Apr 2019 08:27:15 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3N8RDpN016967; Tue, 23 Apr 2019 08:27:13 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201904230827.x3N8RDpN016967@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 23 Apr 2019 08:27:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499731 - in head: . www/gitlab-ce www/gitlab-ce/files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head: . www/gitlab-ce www/gitlab-ce/files X-SVN-Commit-Revision: 499731 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E0528955EE X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.960,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Apr 2019 08:27:16 -0000 Author: mfechner Date: Tue Apr 23 08:27:13 2019 New Revision: 499731 URL: https://svnweb.freebsd.org/changeset/ports/499731 Log: Upgrade to 11.10. For full log see: https://about.gitlab.com/2019/04/22/gitlab-11-10-released/ WARNING, this release switches the path were the repositories are stored back to the default git home dir. Make sure you read the UPDATING 20190423 entry and follow the update maual very carefully! Modified: head/UPDATING head/www/gitlab-ce/Makefile head/www/gitlab-ce/distinfo head/www/gitlab-ce/files/gitlab.in head/www/gitlab-ce/files/patch-Gemfile head/www/gitlab-ce/files/patch-config_gitlab.yml.example head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb head/www/gitlab-ce/pkg-message head/www/gitlab-ce/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Apr 23 08:08:37 2019 (r499730) +++ head/UPDATING Tue Apr 23 08:27:13 2019 (r499731) @@ -5,6 +5,46 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190423: + AFFECTS: users of www/gitlab-ce + AUTHOR: mfechner@FreeBSD.org + + The directory where all repositories and ssh permissions are stored + was changed from /usr/home/git back to /usr/local/git, to match again the + recommended standards on FreeBSD. + This will cause now some other git management packages to collide with + gitlab. Make sure you migrate all you git repositories to gitlab first, + before you continue. + + Make sure /usr/local/git/repositories and /usr/local/git/.ssh are not + existing! + Otherwise the next commands can break your installation for managing + git repositories within gitlab and with your other gitlab management + software! + + You must move the old files to the new location with: + # service gitlab stop + # mv /usr/home/git /usr/local/ + # pkg upg + + Make sure you update your config files, diff shows you what you maybe + must change: + # cd /usr/local/www/gitlab-ce + # git diff config/gitlab.yml.sample config/gitlab.yml + # cd /usr/local/share/gitlab-shell/ + # git diff config.yml.sample config.yml + # cd /usr/local/share/gitaly + # git diff config.toml.sample config.toml + + # Change home directory of user git back to /usr/local/git + # vipw + The line should now looks like: + git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh + + If you do an upgrade of gitlab follow the upgrade guide. + If not, just start gitlab again with: + # service gitlab start + 20190422: AFFECTS: users of security/libressl AUTHOR: brnrd@FreeBSD.org Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/Makefile Tue Apr 23 08:27:13 2019 (r499731) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.9.7 -PORTREVISION= 1 +PORTVERSION= 11.10.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -17,13 +17,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.7.1:devel/gitlab-shell \ - gitlab-workhorse>=8.3.3:www/gitlab-workhorse \ - gitaly>=1.27.1:devel/gitaly \ + gitlab-shell>=9.0.0:devel/gitlab-shell \ + gitlab-workhorse>=8.5.1:www/gitlab-workhorse \ + gitaly>=1.33.0:devel/gitaly \ gitlab-pages>=1.5.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ - rubygem-rails50>=5.0.7.1:www/rubygem-rails50 \ + rubygem-rails50>=5.0.7.2: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 \ rubygem-responders-rails50>=2.0:www/rubygem-responders-rails50 \ @@ -50,9 +50,9 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \ 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-rack-oauth2>=1.9.3:security/rubygem-rack-oauth2 \ rubygem-jwt>=2.1.0:www/rubygem-jwt \ - rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ + rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor-rails50>=3.0.0:security/rubygem-devise-two-factor-rails50 \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ @@ -86,7 +86,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.2.0:www/rubygem-deckar01-task_list \ - rubygem-gitlab-markup>=1.6.5:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ @@ -98,24 +98,24 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \ rubygem-rouge>=3.1:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11:textproc/rubygem-truncato \ - rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ + rubygem-bootstrap_form>=4.2.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.10.1: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 \ - rubygem-rack>=2.0.6:www/rubygem-rack \ + rubygem-rack>=2.0.7:www/rubygem-rack \ rubygem-unicorn>=5.4.1:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \ rubygem-puma>=3.12:www/rubygem-puma \ rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord05>=0.5.1:databases/rubygem-state_machines-activerecord05 \ - rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \ + rubygem-acts-as-taggable-on>=6.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=1.0.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ rubygem-gitlab-sidekiq-fetcher>=0.4.0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit>=1.1:devel/rubygem-fugit \ - rubygem-httparty>=0.13.3:www/rubygem-httparty \ + rubygem-httparty>=0.16.4:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ @@ -127,6 +127,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ rubygem-discordrb-webhooks-blackst0ne>=3.3.0:net-im/rubygem-discordrb-webhooks-blackst0ne \ + rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-flowdock>=0.7:www/rubygem-flowdock \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ @@ -154,9 +155,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-font-awesome-rails-rails50>=4.7:devel/rubygem-font-awesome-rails-rails50 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ rubygem-gon-rails50>=6.2.0:www/rubygem-gon-rails50 \ - rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ 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.7:devel/rubygem-sentry-raven \ @@ -188,7 +187,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sshkey>=2.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=1.13.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.19.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 \ @@ -204,6 +203,12 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ RUN_DEPENDS= ${MY_DEPENDS} +CONFLICTS_INSTALL= gitolite-* \ + gitolite2-* \ + gogs-* \ + gitea-* \ + ${PYTHON_PKGNAMEPREFIX}-gitosis-* + OPTIONS_SINGLE= DATABASE OPTIONS_SINGLE_DATABASE= PGSQL MYSQL OPTIONS_DEFAULT= PGSQL @@ -221,7 +226,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= 93e321569a898d9701a251b4bb73ad56b79fc535 +GL_COMMIT= 8a802d1c6b7ee660fbf701b9758ccff85f065e68 USERS= git GROUPS= git @@ -263,7 +268,7 @@ do-install: ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample - ${MKDIR} ${STAGEDIR}/usr/home/git/repositories + ${MKDIR} ${STAGEDIR}/usr/local/git/repositories ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/distinfo Tue Apr 23 08:27:13 2019 (r499731) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554961124 -SHA256 (gitlab-org-gitlab-ce-93e321569a898d9701a251b4bb73ad56b79fc535_GL0.tar.gz) = b435ba669451bb03c0056942ea2d0bdbf224ce9056533008bbaa7f03b80a044b -SIZE (gitlab-org-gitlab-ce-93e321569a898d9701a251b4bb73ad56b79fc535_GL0.tar.gz) = 61548547 +TIMESTAMP = 1555689889 +SHA256 (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 5a9ae0ae2c77280b9270e8f232b5388a48c6c40a9e0351af1f37a30547e028ee +SIZE (gitlab-org-gitlab-ce-8a802d1c6b7ee660fbf701b9758ccff85f065e68_GL0.tar.gz) = 62602006 Modified: head/www/gitlab-ce/files/gitlab.in ============================================================================== --- head/www/gitlab-ce/files/gitlab.in Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/files/gitlab.in Tue Apr 23 08:27:13 2019 (r499731) @@ -13,8 +13,8 @@ # chkconfig: - 85 14 ### END INIT INFO -# Maintainer: Torsten Zuehlsdorff -# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx +# Maintainer: Matthias Fechner +# Based on work of: @charlienewey, rovanion.luckey@gmail.com, @randx, @tz # PROVIDE: gitlab # REQUIRE: LOGIN @@ -42,6 +42,7 @@ restart_cmd="restart_gitlab" : ${gitlab_workhorse_tcp:="NO"} : ${gitlab_workhorse_addr:="127.0.0.1:8181"} : ${gitlab_mail_room_enable:="NO"} +: ${gitlab_allow_conflicts:="NO"} load_rc_config $name @@ -85,6 +86,44 @@ gitaly_log="$app_root/log/gitaly.log" # Read configuration variable file if it is present test -f /etc/default/gitlab && . /etc/default/gitlab + +# Check if other colliding packages are installed +if `/usr/sbin/pkg -N info -e gogs` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gogs as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e "gitolite*"` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gitolite as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e "*gitosis*"` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with py-gitosis as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi +if `/usr/sbin/pkg -N info -e gitea` && [ $? -eq 0 ]; then + echo "WARNING: Gitlab cannot run together with gitea as both of them modify .ssh/authorized_keys" + if checkyesno gitlab_allow_conflicts; then + echo "but start as overwritten" + else + echo "you can overwrite this with: sysrc gitlab_allow_conflicts=YES" + exit 1 + fi +fi # Switch to the app_user if it is not he/she who is running the script. if [ "$USER" != "$app_user" ]; then Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/files/patch-Gemfile Tue Apr 23 08:27:13 2019 (r499731) @@ -1,13 +1,5 @@ ---- Gemfile.orig 2019-03-20 23:32:21 UTC +--- Gemfile.orig 2019-04-19 09:51:35 UTC +++ Gemfile -@@ -1,6 +1,6 @@ - source 'https://rubygems.org' - --gem 'rails', '5.0.7.1' -+gem 'rails', '5.0.7.2' - gem 'rails-deprecated_sanitizer', '~> 1.0.3' - - # Improves copy-on-write performance for MRI @@ -15,7 +15,7 @@ gem 'sprockets', '~> 3.7.0' gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' @@ -17,16 +9,16 @@ gem 'pg', '~> 1.1', group: :postgres gem 'rugged', '~> 0.28' -@@ -170,7 +170,7 @@ gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'si - gem 'fugit', '~> 1.1' +@@ -202,7 +202,7 @@ gem 'connection_pool', '~> 2.0' + gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false - # HTTP requests --gem 'httparty', '~> 0.13.3' -+gem 'httparty', '>= 0.13.3' + # HipChat integration +-gem 'hipchat', '~> 1.5.0' ++gem 'hipchat', '~> 1.6.0' - # Colored output to console - gem 'rainbow', '~> 3.0' -@@ -295,9 +295,6 @@ gem 'peek-redis', '~> 1.2.0' + # JIRA integration + gem 'jira-ruby', '~> 1.4' +@@ -293,9 +293,6 @@ gem 'peek-redis', '~> 1.2.0' # Metrics group :metrics do @@ -36,7 +28,7 @@ # Prometheus gem 'prometheus-client-mmap', '~> 0.9.4' gem 'raindrops', '~> 0.18' -@@ -307,87 +304,6 @@ group :tracing do +@@ -305,87 +302,6 @@ group :tracing do # OpenTracing gem 'opentracing', '~> 0.4.3' gem 'jaeger-client', '~> 0.10.0' Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab-ce/files/patch-config_gitlab.yml.example Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example Tue Apr 23 08:27:13 2019 (r499731) @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2019-03-20 23:32:21 UTC +--- config/gitlab.yml.example.orig 2019-04-19 09:51:35 UTC +++ config/gitlab.yml.example @@ -248,7 +248,7 @@ production: &base # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -645,7 +645,7 @@ production: &base +@@ -649,7 +649,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,27 +18,34 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -663,8 +663,8 @@ production: &base +@@ -667,8 +667,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). 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). TLS connections are also supported using the system certificate pool (eg: tls://host:port). ++ path: /usr/local/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_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -696,7 +696,7 @@ production: &base +@@ -700,12 +700,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ +- authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%PREFIX%%/share/gitlab-shell/ ++ authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -721,7 +721,7 @@ production: &base +- # secret_file: /home/git/gitlab/.gitlab_shell_secret ++ # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret + + # Git over HTTP + upload_pack: true +@@ -726,7 +726,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: Modified: head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Tue Apr 23 08:27:13 2019 (r499731) @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2018-12-21 14:23:37 UTC +--- config/initializers/1_settings.rb.orig 2019-04-19 09:51:35 UTC +++ config/initializers/1_settings.rb -@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA +@@ -145,12 +145,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' Modified: head/www/gitlab-ce/pkg-message ============================================================================== --- head/www/gitlab-ce/pkg-message Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/pkg-message Tue Apr 23 08:27:13 2019 (r499731) @@ -1,6 +1,10 @@ vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv GITLAB vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv Gitlab was installed successfully. + +!! WARNING: Please make sure you read in UPDATING entry 20190423 !! + + You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: Modified: head/www/gitlab-ce/pkg-plist ============================================================================== --- head/www/gitlab-ce/pkg-plist Tue Apr 23 08:08:37 2019 (r499730) +++ head/www/gitlab-ce/pkg-plist Tue Apr 23 08:27:13 2019 (r499731) @@ -11,6 +11,7 @@ %%WWWDIR%%/.gitlab/issue_templates/Acceptance_Testing.md %%WWWDIR%%/.gitlab/issue_templates/Bug.md %%WWWDIR%%/.gitlab/issue_templates/Coding style proposal.md +%%WWWDIR%%/.gitlab/issue_templates/Database Reviewer.md %%WWWDIR%%/.gitlab/issue_templates/Doc Review.md %%WWWDIR%%/.gitlab/issue_templates/Documentation.md %%WWWDIR%%/.gitlab/issue_templates/Feature proposal.md @@ -47,6 +48,8 @@ %%WWWDIR%%/MAINTENANCE.md %%WWWDIR%%/PHILOSOPHY.md %%WWWDIR%%/PROCESS.md +%%WWWDIR%%/Pipfile +%%WWWDIR%%/Pipfile.lock %%WWWDIR%%/Procfile %%WWWDIR%%/README.md %%WWWDIR%%/Rakefile @@ -1927,6 +1930,9 @@ %%WWWDIR%%/app/assets/images/none-scheme-preview.png %%WWWDIR%%/app/assets/images/old_repo.png %%WWWDIR%%/app/assets/images/onion_skin_sprites.gif +%%WWWDIR%%/app/assets/images/select2-spinner.gif +%%WWWDIR%%/app/assets/images/select2.png +%%WWWDIR%%/app/assets/images/select2x2.png %%WWWDIR%%/app/assets/images/solarized-dark-scheme-preview.png %%WWWDIR%%/app/assets/images/solarized-light-scheme-preview.png %%WWWDIR%%/app/assets/images/swipemode_sprites.gif @@ -1939,6 +1945,7 @@ %%WWWDIR%%/app/assets/javascripts/ajax_loading_spinner.js %%WWWDIR%%/app/assets/javascripts/api.js %%WWWDIR%%/app/assets/javascripts/autosave.js +%%WWWDIR%%/app/assets/javascripts/avatar_picker.js %%WWWDIR%%/app/assets/javascripts/awards_handler.js %%WWWDIR%%/app/assets/javascripts/badges/components/badge.vue %%WWWDIR%%/app/assets/javascripts/badges/components/badge_form.vue @@ -2232,9 +2239,16 @@ %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_bundle.js %%WWWDIR%%/app/assets/javascripts/environments/folder/environments_folder_view.vue %%WWWDIR%%/app/assets/javascripts/environments/index.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/canary_callout_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/container_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environment_item_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_app_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_folder_view_mixin.js %%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_mixin.js +%%WWWDIR%%/app/assets/javascripts/environments/mixins/environments_table_mixin.js %%WWWDIR%%/app/assets/javascripts/environments/services/environments_service.js %%WWWDIR%%/app/assets/javascripts/environments/stores/environments_store.js +%%WWWDIR%%/app/assets/javascripts/environments/stores/helpers.js %%WWWDIR%%/app/assets/javascripts/error_tracking/components/error_tracking_list.vue %%WWWDIR%%/app/assets/javascripts/error_tracking/index.js %%WWWDIR%%/app/assets/javascripts/error_tracking/services/index.js @@ -2280,6 +2294,7 @@ %%WWWDIR%%/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/null_dropdown.js %%WWWDIR%%/app/assets/javascripts/filtered_search/recent_searches_root.js +%%WWWDIR%%/app/assets/javascripts/filtered_search/recent_searches_storage_keys.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service.js %%WWWDIR%%/app/assets/javascripts/filtered_search/services/recent_searches_service_error.js %%WWWDIR%%/app/assets/javascripts/filtered_search/stores/recent_searches_store.js @@ -2308,7 +2323,6 @@ %%WWWDIR%%/app/assets/javascripts/gl_form.js %%WWWDIR%%/app/assets/javascripts/gpg_badges.js %%WWWDIR%%/app/assets/javascripts/group.js -%%WWWDIR%%/app/assets/javascripts/group_avatar.js %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js %%WWWDIR%%/app/assets/javascripts/groups/components/app.vue %%WWWDIR%%/app/assets/javascripts/groups/components/group_folder.vue @@ -2333,6 +2347,7 @@ %%WWWDIR%%/app/assets/javascripts/help/help.js %%WWWDIR%%/app/assets/javascripts/helpers/avatar_helper.js %%WWWDIR%%/app/assets/javascripts/helpers/issuables_helper.js +%%WWWDIR%%/app/assets/javascripts/helpers/monitor_helper.js %%WWWDIR%%/app/assets/javascripts/how_to_merge.js %%WWWDIR%%/app/assets/javascripts/ide/components/activity_bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/branches/item.vue @@ -2518,6 +2533,7 @@ %%WWWDIR%%/app/assets/javascripts/issue_show/mixins/update.js %%WWWDIR%%/app/assets/javascripts/issue_show/services/index.js %%WWWDIR%%/app/assets/javascripts/issue_show/stores/index.js +%%WWWDIR%%/app/assets/javascripts/issue_show/utils/parse_data.js %%WWWDIR%%/app/assets/javascripts/issue_status_select.js %%WWWDIR%%/app/assets/javascripts/jobs/components/artifacts_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/commit_block.vue @@ -2534,6 +2550,7 @@ %%WWWDIR%%/app/assets/javascripts/jobs/components/stages_dropdown.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/stuck_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/components/trigger_block.vue +%%WWWDIR%%/app/assets/javascripts/jobs/components/unmet_prerequisites_block.vue %%WWWDIR%%/app/assets/javascripts/jobs/index.js %%WWWDIR%%/app/assets/javascripts/jobs/mixins/delayed_job_mixin.js %%WWWDIR%%/app/assets/javascripts/jobs/store/actions.js @@ -2555,6 +2572,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/accessor.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ace_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ajax_cache.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/autosave.js %%WWWDIR%%/app/assets/javascripts/lib/utils/axios_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/bootstrap_linked_tabs.js %%WWWDIR%%/app/assets/javascripts/lib/utils/cache.js @@ -2566,6 +2584,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/file_upload.js %%WWWDIR%%/app/assets/javascripts/lib/utils/grammar.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/highlight.js %%WWWDIR%%/app/assets/javascripts/lib/utils/http_status.js %%WWWDIR%%/app/assets/javascripts/lib/utils/icon_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js @@ -2618,6 +2637,7 @@ %%WWWDIR%%/app/assets/javascripts/monitoring/monitoring_bundle.js %%WWWDIR%%/app/assets/javascripts/monitoring/services/monitoring_service.js %%WWWDIR%%/app/assets/javascripts/monitoring/stores/monitoring_store.js +%%WWWDIR%%/app/assets/javascripts/monitoring/utils.js %%WWWDIR%%/app/assets/javascripts/mr_notes/index.js %%WWWDIR%%/app/assets/javascripts/mr_notes/init_notes.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/actions.js @@ -2626,6 +2646,10 @@ %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/modules/index.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/mr_notes/stores/mutations.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/components/mr_popover.vue +%%WWWDIR%%/app/assets/javascripts/mr_popover/constants.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/index.js +%%WWWDIR%%/app/assets/javascripts/mr_popover/queries/merge_request.graphql %%WWWDIR%%/app/assets/javascripts/namespace_select.js %%WWWDIR%%/app/assets/javascripts/network/branch_graph.js %%WWWDIR%%/app/assets/javascripts/network/raphael.js @@ -2731,6 +2755,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/details/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/group_members/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/index.js @@ -2745,7 +2770,8 @@ %%WWWDIR%%/app/assets/javascripts/pages/groups/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/settings/badges/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js -%%WWWDIR%%/app/assets/javascripts/pages/groups/show/group_tabs.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/shared/group_details.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/shared/group_tabs.js %%WWWDIR%%/app/assets/javascripts/pages/groups/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/help/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/help/show/index.js @@ -2946,7 +2972,9 @@ %%WWWDIR%%/app/assets/javascripts/pipelines/constants.js %%WWWDIR%%/app/assets/javascripts/pipelines/event_hub.js %%WWWDIR%%/app/assets/javascripts/pipelines/mixins/graph_component_mixin.js +%%WWWDIR%%/app/assets/javascripts/pipelines/mixins/graph_pipeline_bundle_mixin.js %%WWWDIR%%/app/assets/javascripts/pipelines/mixins/pipelines.js +%%WWWDIR%%/app/assets/javascripts/pipelines/mixins/stage_column_mixin.js %%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_bundle.js %%WWWDIR%%/app/assets/javascripts/pipelines/pipeline_details_mediator.js %%WWWDIR%%/app/assets/javascripts/pipelines/services/pipeline_service.js @@ -3009,6 +3037,13 @@ %%WWWDIR%%/app/assets/javascripts/registry/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/registry/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/registry/stores/state.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/index.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/actions.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/index.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/related_merge_requests/store/state.js %%WWWDIR%%/app/assets/javascripts/releases/components/app.vue %%WWWDIR%%/app/assets/javascripts/releases/components/release_block.vue %%WWWDIR%%/app/assets/javascripts/releases/index.js @@ -3038,18 +3073,25 @@ %%WWWDIR%%/app/assets/javascripts/reports/store/utils.js %%WWWDIR%%/app/assets/javascripts/right_sidebar.js %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/serverless/components/area.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/environment_row.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/function_details.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/function_row.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/functions.vue +%%WWWDIR%%/app/assets/javascripts/serverless/components/missing_prometheus.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/pod_box.vue %%WWWDIR%%/app/assets/javascripts/serverless/components/url.vue +%%WWWDIR%%/app/assets/javascripts/serverless/constants.js %%WWWDIR%%/app/assets/javascripts/serverless/event_hub.js %%WWWDIR%%/app/assets/javascripts/serverless/serverless_bundle.js -%%WWWDIR%%/app/assets/javascripts/serverless/services/get_functions_service.js -%%WWWDIR%%/app/assets/javascripts/serverless/stores/serverless_details_store.js -%%WWWDIR%%/app/assets/javascripts/serverless/stores/serverless_store.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/actions.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/getters.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/index.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/serverless/store/state.js +%%WWWDIR%%/app/assets/javascripts/serverless/utils.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/event_hub.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue @@ -3118,6 +3160,7 @@ %%WWWDIR%%/app/assets/javascripts/version_check_image.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_alert_message.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue @@ -3153,6 +3196,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/constants.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/event_hub.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/index.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/mixins/mr_widget_pipeline.js @@ -3211,12 +3255,14 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/related_issuable_item.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/diff_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_row.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue @@ -3232,7 +3278,10 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pikaday.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_avatar/default.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_avatar/image.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_selector/project_list_item.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/project_selector/project_selector.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/recaptcha_modal.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/resizable_chart/resizable_chart_container.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/select2_select.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/collapsed_calendar_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/collapsed_grouped_date_picker.vue @@ -3246,6 +3295,8 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_title.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_regular_label.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_value_scoped_label.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/toggle_sidebar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue @@ -3284,7 +3335,9 @@ %%WWWDIR%%/app/assets/stylesheets/behaviors.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss +%%WWWDIR%%/app/assets/stylesheets/components/dashboard_skeleton.scss %%WWWDIR%%/app/assets/stylesheets/components/popover.scss +%%WWWDIR%%/app/assets/stylesheets/components/project_list_item.scss %%WWWDIR%%/app/assets/stylesheets/components/related_items_list.scss %%WWWDIR%%/app/assets/stylesheets/csslab.scss %%WWWDIR%%/app/assets/stylesheets/emoji_sprites.scss @@ -3340,6 +3393,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/selects.scss %%WWWDIR%%/app/assets/stylesheets/framework/sidebar.scss %%WWWDIR%%/app/assets/stylesheets/framework/snippets.scss +%%WWWDIR%%/app/assets/stylesheets/framework/sortable.scss %%WWWDIR%%/app/assets/stylesheets/framework/spinner.scss %%WWWDIR%%/app/assets/stylesheets/framework/stacked_progress_bar.scss %%WWWDIR%%/app/assets/stylesheets/framework/system_messages.scss @@ -3398,6 +3452,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/merge_conflicts.scss %%WWWDIR%%/app/assets/stylesheets/pages/merge_requests.scss %%WWWDIR%%/app/assets/stylesheets/pages/milestone.scss +%%WWWDIR%%/app/assets/stylesheets/pages/monitor.scss %%WWWDIR%%/app/assets/stylesheets/pages/note_form.scss %%WWWDIR%%/app/assets/stylesheets/pages/notes.scss %%WWWDIR%%/app/assets/stylesheets/pages/notifications.scss @@ -3424,6 +3479,7 @@ %%WWWDIR%%/app/assets/stylesheets/print.scss %%WWWDIR%%/app/assets/stylesheets/snippets.scss %%WWWDIR%%/app/assets/stylesheets/test.scss +%%WWWDIR%%/app/assets/stylesheets/utilities.scss %%WWWDIR%%/app/controllers/abuse_reports_controller.rb %%WWWDIR%%/app/controllers/admin/abuse_reports_controller.rb %%WWWDIR%%/app/controllers/admin/appearances_controller.rb @@ -3466,6 +3522,7 @@ %%WWWDIR%%/app/controllers/clusters/clusters_controller.rb %%WWWDIR%%/app/controllers/concerns/accepts_pending_invitations.rb %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb +%%WWWDIR%%/app/controllers/concerns/boards_actions.rb %%WWWDIR%%/app/controllers/concerns/boards_responses.rb %%WWWDIR%%/app/controllers/concerns/checks_collaboration.rb %%WWWDIR%%/app/controllers/concerns/continue_params.rb @@ -3606,6 +3663,7 @@ %%WWWDIR%%/app/controllers/projects/deploy_tokens_controller.rb %%WWWDIR%%/app/controllers/projects/deployments_controller.rb %%WWWDIR%%/app/controllers/projects/discussions_controller.rb +%%WWWDIR%%/app/controllers/projects/environments/prometheus_api_controller.rb %%WWWDIR%%/app/controllers/projects/environments_controller.rb %%WWWDIR%%/app/controllers/projects/error_tracking_controller.rb %%WWWDIR%%/app/controllers/projects/find_file_controller.rb @@ -3766,6 +3824,7 @@ %%WWWDIR%%/app/graphql/types/base_object.rb %%WWWDIR%%/app/graphql/types/base_scalar.rb %%WWWDIR%%/app/graphql/types/base_union.rb +%%WWWDIR%%/app/graphql/types/ci/detailed_status_type.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_status_enum.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_type.rb %%WWWDIR%%/app/graphql/types/issuable_state_enum.rb @@ -3916,6 +3975,7 @@ %%WWWDIR%%/app/models/application_record.rb %%WWWDIR%%/app/models/application_setting.rb %%WWWDIR%%/app/models/application_setting/term.rb +%%WWWDIR%%/app/models/application_setting_implementation.rb %%WWWDIR%%/app/models/audit_event.rb %%WWWDIR%%/app/models/award_emoji.rb %%WWWDIR%%/app/models/badge.rb @@ -4059,6 +4119,7 @@ %%WWWDIR%%/app/models/concerns/iid_routes.rb %%WWWDIR%%/app/models/concerns/importable.rb %%WWWDIR%%/app/models/concerns/issuable.rb +%%WWWDIR%%/app/models/concerns/issuable_states.rb %%WWWDIR%%/app/models/concerns/label_eventable.rb %%WWWDIR%%/app/models/concerns/loaded_in_group_list.rb %%WWWDIR%%/app/models/concerns/manual_inverse_association.rb @@ -4197,6 +4258,7 @@ %%WWWDIR%%/app/models/members_preloader.rb %%WWWDIR%%/app/models/merge_request.rb %%WWWDIR%%/app/models/merge_request/metrics.rb +%%WWWDIR%%/app/models/merge_request_assignee.rb %%WWWDIR%%/app/models/merge_request_diff.rb %%WWWDIR%%/app/models/merge_request_diff_commit.rb %%WWWDIR%%/app/models/merge_request_diff_file.rb @@ -4257,6 +4319,7 @@ %%WWWDIR%%/app/models/project_services/flowdock_service.rb %%WWWDIR%%/app/models/project_services/gitlab_issue_tracker_service.rb %%WWWDIR%%/app/models/project_services/hangouts_chat_service.rb +%%WWWDIR%%/app/models/project_services/hipchat_service.rb %%WWWDIR%%/app/models/project_services/irker_service.rb %%WWWDIR%%/app/models/project_services/issue_tracker_service.rb %%WWWDIR%%/app/models/project_services/jira_service.rb @@ -4305,6 +4368,7 @@ %%WWWDIR%%/app/models/route.rb %%WWWDIR%%/app/models/security_event.rb %%WWWDIR%%/app/models/sent_notification.rb +%%WWWDIR%%/app/models/serverless/function.rb %%WWWDIR%%/app/models/service.rb %%WWWDIR%%/app/models/shard.rb %%WWWDIR%%/app/models/snippet.rb @@ -4361,6 +4425,7 @@ %%WWWDIR%%/app/policies/group_label_policy.rb %%WWWDIR%%/app/policies/group_member_policy.rb %%WWWDIR%%/app/policies/group_policy.rb +%%WWWDIR%%/app/policies/identity_provider_policy.rb %%WWWDIR%%/app/policies/issuable_policy.rb %%WWWDIR%%/app/policies/issue_policy.rb %%WWWDIR%%/app/policies/merge_request_policy.rb @@ -4381,6 +4446,7 @@ %%WWWDIR%%/app/presenters/README.md %%WWWDIR%%/app/presenters/blob_presenter.rb %%WWWDIR%%/app/presenters/blobs/unfold_presenter.rb +%%WWWDIR%%/app/presenters/ci/bridge_presenter.rb %%WWWDIR%%/app/presenters/ci/build_metadata_presenter.rb %%WWWDIR%%/app/presenters/ci/build_presenter.rb %%WWWDIR%%/app/presenters/ci/build_runner_presenter.rb @@ -4531,6 +4597,7 @@ %%WWWDIR%%/app/serializers/stage_serializer.rb %%WWWDIR%%/app/serializers/submodule_entity.rb %%WWWDIR%%/app/serializers/suggestion_entity.rb +%%WWWDIR%%/app/serializers/suggestion_serializer.rb %%WWWDIR%%/app/serializers/test_case_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_serializer.rb @@ -4583,6 +4650,7 @@ %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb %%WWWDIR%%/app/services/ci/pipeline_trigger_service.rb %%WWWDIR%%/app/services/ci/play_build_service.rb +%%WWWDIR%%/app/services/ci/prepare_build_service.rb %%WWWDIR%%/app/services/ci/process_build_service.rb %%WWWDIR%%/app/services/ci/process_pipeline_service.rb %%WWWDIR%%/app/services/ci/register_job_service.rb @@ -4623,9 +4691,11 @@ %%WWWDIR%%/app/services/compare_service.rb %%WWWDIR%%/app/services/concerns/exclusive_lease_guard.rb %%WWWDIR%%/app/services/concerns/issues/resolve_discussions.rb +%%WWWDIR%%/app/services/concerns/suggestible.rb %%WWWDIR%%/app/services/concerns/update_visibility_level.rb %%WWWDIR%%/app/services/concerns/users/new_user_notifier.rb %%WWWDIR%%/app/services/concerns/users/participable_service.rb +%%WWWDIR%%/app/services/concerns/validates_classification_label.rb %%WWWDIR%%/app/services/create_branch_service.rb %%WWWDIR%%/app/services/create_snippet_service.rb %%WWWDIR%%/app/services/delete_branch_service.rb @@ -4649,10 +4719,11 @@ %%WWWDIR%%/app/services/files/delete_service.rb %%WWWDIR%%/app/services/files/multi_service.rb %%WWWDIR%%/app/services/files/update_service.rb -%%WWWDIR%%/app/services/git_push_service.rb -%%WWWDIR%%/app/services/git_tag_push_service.rb +%%WWWDIR%%/app/services/git/branch_push_service.rb +%%WWWDIR%%/app/services/git/tag_push_service.rb %%WWWDIR%%/app/services/gpg_keys/create_service.rb %%WWWDIR%%/app/services/gravatar_service.rb +%%WWWDIR%%/app/services/groups/auto_devops_service.rb %%WWWDIR%%/app/services/groups/base_service.rb %%WWWDIR%%/app/services/groups/create_service.rb %%WWWDIR%%/app/services/groups/destroy_service.rb @@ -4721,7 +4792,9 @@ %%WWWDIR%%/app/services/merge_requests/merge_service.rb %%WWWDIR%%/app/services/merge_requests/merge_to_ref_service.rb %%WWWDIR%%/app/services/merge_requests/merge_when_pipeline_succeeds_service.rb +%%WWWDIR%%/app/services/merge_requests/migrate_external_diffs_service.rb %%WWWDIR%%/app/services/merge_requests/post_merge_service.rb +%%WWWDIR%%/app/services/merge_requests/push_options_handler_service.rb %%WWWDIR%%/app/services/merge_requests/rebase_service.rb %%WWWDIR%%/app/services/merge_requests/refresh_service.rb %%WWWDIR%%/app/services/merge_requests/reload_diffs_service.rb @@ -4817,6 +4890,7 @@ %%WWWDIR%%/app/services/projects/update_remote_mirror_service.rb %%WWWDIR%%/app/services/projects/update_service.rb %%WWWDIR%%/app/services/prometheus/adapter_service.rb +%%WWWDIR%%/app/services/prometheus/proxy_service.rb %%WWWDIR%%/app/services/protected_branches/access_level_params.rb %%WWWDIR%%/app/services/protected_branches/api_service.rb %%WWWDIR%%/app/services/protected_branches/create_service.rb @@ -4850,6 +4924,7 @@ %%WWWDIR%%/app/services/submodules/update_service.rb %%WWWDIR%%/app/services/suggestions/apply_service.rb %%WWWDIR%%/app/services/suggestions/create_service.rb +%%WWWDIR%%/app/services/suggestions/outdate_service.rb %%WWWDIR%%/app/services/system_hooks_service.rb %%WWWDIR%%/app/services/system_note_service.rb %%WWWDIR%%/app/services/tags/create_service.rb @@ -4915,8 +4990,8 @@ %%WWWDIR%%/app/validators/color_validator.rb %%WWWDIR%%/app/validators/cron_timezone_validator.rb %%WWWDIR%%/app/validators/cron_validator.rb +%%WWWDIR%%/app/validators/devise_email_validator.rb %%WWWDIR%%/app/validators/duration_validator.rb -%%WWWDIR%%/app/validators/email_validator.rb %%WWWDIR%%/app/validators/js_regex_validator.rb %%WWWDIR%%/app/validators/key_restriction_validator.rb %%WWWDIR%%/app/validators/line_code_validator.rb @@ -4928,6 +5003,7 @@ %%WWWDIR%%/app/validators/top_level_group_validator.rb %%WWWDIR%%/app/validators/url_validator.rb %%WWWDIR%%/app/validators/variable_duplicates_validator.rb +%%WWWDIR%%/app/validators/x509_certificate_credentials_validator.rb %%WWWDIR%%/app/views/abuse_report_mailer/notify.html.haml %%WWWDIR%%/app/views/abuse_report_mailer/notify.text.haml %%WWWDIR%%/app/views/abuse_reports/new.html.haml @@ -4942,6 +5018,7 @@ %%WWWDIR%%/app/views/admin/application_settings/_ci_cd.html.haml %%WWWDIR%%/app/views/admin/application_settings/_diff_limits.html.haml %%WWWDIR%%/app/views/admin/application_settings/_email.html.haml +%%WWWDIR%%/app/views/admin/application_settings/_external_authorization_service_form.html.haml %%WWWDIR%%/app/views/admin/application_settings/_gitaly.html.haml %%WWWDIR%%/app/views/admin/application_settings/_help_page.html.haml %%WWWDIR%%/app/views/admin/application_settings/_influx.html.haml @@ -5227,8 +5304,10 @@ %%WWWDIR%%/app/views/groups/settings/_general.html.haml %%WWWDIR%%/app/views/groups/settings/_lfs.html.haml %%WWWDIR%%/app/views/groups/settings/_permissions.html.haml +%%WWWDIR%%/app/views/groups/settings/_project_creation_level.html.haml %%WWWDIR%%/app/views/groups/settings/_two_factor_auth.html.haml %%WWWDIR%%/app/views/groups/settings/badges/index.html.haml +%%WWWDIR%%/app/views/groups/settings/ci_cd/_auto_devops_form.html.haml %%WWWDIR%%/app/views/groups/settings/ci_cd/show.html.haml %%WWWDIR%%/app/views/groups/show.atom.builder %%WWWDIR%%/app/views/groups/show.html.haml @@ -5319,6 +5398,7 @@ %%WWWDIR%%/app/views/layouts/mailer.text.erb %%WWWDIR%%/app/views/layouts/mailer/devise.html.haml %%WWWDIR%%/app/views/layouts/nav/_breadcrumbs.html.haml +%%WWWDIR%%/app/views/layouts/nav/_classification_level_banner.html.haml %%WWWDIR%%/app/views/layouts/nav/_dashboard.html.haml %%WWWDIR%%/app/views/layouts/nav/_explore.html.haml %%WWWDIR%%/app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml @@ -5450,7 +5530,9 @@ %%WWWDIR%%/app/views/peek/views/_gc.html.haml %%WWWDIR%%/app/views/peek/views/_redis.html.haml %%WWWDIR%%/app/views/peek/views/_sidekiq.html.haml +%%WWWDIR%%/app/views/profiles/_email_settings.html.haml %%WWWDIR%%/app/views/profiles/_event_table.html.haml +%%WWWDIR%%/app/views/profiles/accounts/_providers.html.haml %%WWWDIR%%/app/views/profiles/accounts/show.html.haml %%WWWDIR%%/app/views/profiles/active_sessions/_active_session.html.haml %%WWWDIR%%/app/views/profiles/active_sessions/index.html.haml @@ -5469,6 +5551,7 @@ %%WWWDIR%%/app/views/profiles/keys/_key_table.html.haml %%WWWDIR%%/app/views/profiles/keys/index.html.haml %%WWWDIR%%/app/views/profiles/keys/show.html.haml +%%WWWDIR%%/app/views/profiles/notifications/_email_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/_group_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/_project_settings.html.haml %%WWWDIR%%/app/views/profiles/notifications/show.html.haml @@ -5484,6 +5567,7 @@ %%WWWDIR%%/app/views/profiles/two_factor_auths/show.html.haml %%WWWDIR%%/app/views/projects/_activity.html.haml %%WWWDIR%%/app/views/projects/_bitbucket_import_modal.html.haml +%%WWWDIR%%/app/views/projects/_classification_policy_settings.html.haml %%WWWDIR%%/app/views/projects/_commit_button.html.haml %%WWWDIR%%/app/views/projects/_customize_workflow.html.haml %%WWWDIR%%/app/views/projects/_deletion_failed.html.haml @@ -5681,12 +5765,10 @@ %%WWWDIR%%/app/views/projects/imports/new.html.haml %%WWWDIR%%/app/views/projects/imports/show.html.haml %%WWWDIR%%/app/views/projects/issues/_by_email_description.html.haml -%%WWWDIR%%/app/views/projects/issues/_closed_by_box.html.haml %%WWWDIR%%/app/views/projects/issues/_discussion.html.haml %%WWWDIR%%/app/views/projects/issues/_form.html.haml %%WWWDIR%%/app/views/projects/issues/_issue.html.haml %%WWWDIR%%/app/views/projects/issues/_issues.html.haml -%%WWWDIR%%/app/views/projects/issues/_merge_requests.html.haml %%WWWDIR%%/app/views/projects/issues/_merge_requests_status.html.haml %%WWWDIR%%/app/views/projects/issues/_nav_btns.html.haml %%WWWDIR%%/app/views/projects/issues/_new_branch.html.haml @@ -5930,13 +6012,14 @@ %%WWWDIR%%/app/views/search/results/_note.html.haml %%WWWDIR%%/app/views/search/results/_snippet_blob.html.haml %%WWWDIR%%/app/views/search/results/_snippet_title.html.haml +%%WWWDIR%%/app/views/search/results/_user.html.haml %%WWWDIR%%/app/views/search/results/_wiki_blob.html.haml %%WWWDIR%%/app/views/search/show.html.haml %%WWWDIR%%/app/views/sent_notifications/unsubscribe.html.haml %%WWWDIR%%/app/views/shared/_allow_request_access.html.haml %%WWWDIR%%/app/views/shared/_auto_devops_callout.html.haml %%WWWDIR%%/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml -%%WWWDIR%%/app/views/shared/_choose_group_avatar_button.html.haml +%%WWWDIR%%/app/views/shared/_choose_avatar_button.html.haml %%WWWDIR%%/app/views/shared/_clone_panel.html.haml %%WWWDIR%%/app/views/shared/_commit_message_container.html.haml %%WWWDIR%%/app/views/shared/_commit_well.html.haml @@ -6277,6 +6360,7 @@ %%WWWDIR%%/app/workers/build_trace_sections_worker.rb %%WWWDIR%%/app/workers/chat_notification_worker.rb %%WWWDIR%%/app/workers/ci/archive_traces_cron_worker.rb +%%WWWDIR%%/app/workers/ci/build_prepare_worker.rb %%WWWDIR%%/app/workers/ci/build_schedule_worker.rb %%WWWDIR%%/app/workers/ci/build_trace_chunk_flush_worker.rb %%WWWDIR%%/app/workers/cleanup_container_repository_worker.rb @@ -6358,6 +6442,7 @@ %%WWWDIR%%/app/workers/mail_scheduler/issue_due_worker.rb %%WWWDIR%%/app/workers/mail_scheduler/notification_service_worker.rb %%WWWDIR%%/app/workers/merge_worker.rb +%%WWWDIR%%/app/workers/migrate_external_diffs_worker.rb %%WWWDIR%%/app/workers/namespaceless_project_destroy_worker.rb %%WWWDIR%%/app/workers/new_issue_worker.rb %%WWWDIR%%/app/workers/new_merge_request_worker.rb @@ -6407,6 +6492,7 @@ %%WWWDIR%%/app/workers/repository_update_remote_mirror_worker.rb %%WWWDIR%%/app/workers/requests_profiles_worker.rb %%WWWDIR%%/app/workers/run_pipeline_schedule_worker.rb +%%WWWDIR%%/app/workers/schedule_migrate_external_diffs_worker.rb %%WWWDIR%%/app/workers/stage_update_worker.rb %%WWWDIR%%/app/workers/stuck_ci_jobs_worker.rb %%WWWDIR%%/app/workers/stuck_import_jobs_worker.rb @@ -6458,6 +6544,7 @@ %%WWWDIR%%/config/environments/development.rb %%WWWDIR%%/config/environments/production.rb %%WWWDIR%%/config/environments/test.rb +%%WWWDIR%%/config/helpers/is_ee_env.js %%WWWDIR%%/config/initializers/01_secret_token.rb %%WWWDIR%%/config/initializers/0_acts_as_taggable.rb %%WWWDIR%%/config/initializers/0_as_concern.rb @@ -6519,6 +6606,8 @@ %%WWWDIR%%/config/initializers/grpc.rb %%WWWDIR%%/config/initializers/hamlit.rb %%WWWDIR%%/config/initializers/health_check.rb +%%WWWDIR%%/config/initializers/hipchat_client_patch.rb +%%WWWDIR%%/config/initializers/jira.rb %%WWWDIR%%/config/initializers/kaminari_active_record_relation_methods_with_limit.rb %%WWWDIR%%/config/initializers/kaminari_config.rb %%WWWDIR%%/config/initializers/lograge.rb @@ -6618,18 +6707,20 @@ %%WWWDIR%%/danger/eslint/Dangerfile %%WWWDIR%%/danger/frozen_string/Dangerfile %%WWWDIR%%/danger/gemfile/Dangerfile +%%WWWDIR%%/danger/gitlab_ui_wg/Dangerfile %%WWWDIR%%/danger/metadata/Dangerfile %%WWWDIR%%/danger/plugins/helper.rb %%WWWDIR%%/danger/prettier/Dangerfile %%WWWDIR%%/danger/roulette/Dangerfile +%%WWWDIR%%/danger/single_codebase/Dangerfile %%WWWDIR%%/danger/specs/Dangerfile %%WWWDIR%%/db/fixtures/development/01_admin.rb -%%WWWDIR%%/db/fixtures/development/03_settings.rb -%%WWWDIR%%/db/fixtures/development/04_project.rb +%%WWWDIR%%/db/fixtures/development/02_application_settings.rb +%%WWWDIR%%/db/fixtures/development/03_project.rb +%%WWWDIR%%/db/fixtures/development/04_labels.rb %%WWWDIR%%/db/fixtures/development/05_users.rb %%WWWDIR%%/db/fixtures/development/06_teams.rb %%WWWDIR%%/db/fixtures/development/07_milestones.rb -%%WWWDIR%%/db/fixtures/development/08_settings.rb %%WWWDIR%%/db/fixtures/development/09_issues.rb %%WWWDIR%%/db/fixtures/development/10_merge_requests.rb %%WWWDIR%%/db/fixtures/development/11_keys.rb @@ -6643,9 +6734,9 @@ %%WWWDIR%%/db/fixtures/development/19_environments.rb %%WWWDIR%%/db/fixtures/development/20_nested_groups.rb %%WWWDIR%%/db/fixtures/development/21_conversational_development_index_metrics.rb -%%WWWDIR%%/db/fixtures/development/22_labeled_issues_seed.rb %%WWWDIR%%/db/fixtures/development/23_spam_logs.rb %%WWWDIR%%/db/fixtures/development/24_forks.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***