From owner-svn-ports-all@freebsd.org Fri Aug 30 07:50:57 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 81CDDC5C2C; Fri, 30 Aug 2019 07:50:57 +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 46KWr13ZVgz3KLD; Fri, 30 Aug 2019 07:50:57 +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 433AA2CF95; Fri, 30 Aug 2019 07:50:57 +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 x7U7ovir033443; Fri, 30 Aug 2019 07:50:57 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7U7otZ3033433; Fri, 30 Aug 2019 07:50:55 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201908300750.x7U7otZ3033433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 30 Aug 2019 07:50:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510253 - 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: 510253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Aug 2019 07:50:57 -0000 Author: mfechner Date: Fri Aug 30 07:50:54 2019 New Revision: 510253 URL: https://svnweb.freebsd.org/changeset/ports/510253 Log: www/gitlab-ce: Upgrade to next major version 12.1 It requires PostgreSQL version 10.7, so make sure you upgrade PostgreSQL first. I recommand to go to version 11 as described in UPDATING entry 20190829. MySQL support was now completely removed upstream. Changelogs: https://about.gitlab.com/2019/07/22/gitlab-12-1-released/ https://about.gitlab.com/2019/07/24/gitlab-12-1-1-released/ https://about.gitlab.com/2019/07/29/security-release-gitlab-12-dot-1-dot-2-released/ https://about.gitlab.com/2019/07/31/gitlab-12-1-3-released/ https://about.gitlab.com/2019/08/06/gitlab-12-1-4-released/ https://about.gitlab.com/2019/08/12/critical-security-release-gitlab-12-dot-1-dot-6-released/ https://about.gitlab.com/2019/08/29/security-release-gitlab-12-dot-2-dot-3-released/ Added: head/www/gitlab-ce/files/patch-config_puma.rb.example (contents, props changed) 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 Fri Aug 30 07:37:26 2019 (r510252) +++ head/UPDATING Fri Aug 30 07:50:54 2019 (r510253) @@ -5,6 +5,17 @@ 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. +20190830: + AFFECTS: users of www/gitlab-ce + AUTHOR: mfechner@FreeBSD.org + + Make sure you upgrade your PostgreSQL to version 11 as described in 20190829, + before you upgrade your gitlab-ce version. + Gitlab-ce 12.1 needs at least PostgreSQL version 9.6. + + After this you can follow the usual upgrade guide: + https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.0-12.1-freebsd.md + 20190829: AFFECTS: users of database/postgresql* and other software using PostgreSQL to run AUTHOR: tz@FreeBSD.org Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/Makefile Fri Aug 30 07:50:54 2019 (r510253) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.0.6 +PORTVERSION= 12.1.8 PORTREVISION= 0 CATEGORIES= www devel @@ -14,24 +14,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! -# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS +# only rubygem-pg is defined later as RUN_DEPENDS # for the options MY_DEPENDS= git>=2.21.0:devel/git \ gitlab-shell>=9.3.0:devel/gitlab-shell \ - gitlab-workhorse>=8.7.0:www/gitlab-workhorse \ - gitaly>=1.47.2:devel/gitaly \ - gitlab-pages>=1.6.2:www/gitlab-pages \ + gitlab-workhorse>=8.7.1:www/gitlab-workhorse \ + gitaly>=1.53.3:devel/gitaly \ + gitlab-pages>=1.7.1:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ - rubygem-rails5>=5.1.7:www/rubygem-rails5 \ + rubygem-rails52>=5.2.3:www/rubygem-rails52 \ rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \ - rubygem-responders2-rails5>=2.0:www/rubygem-responders2-rails5 \ + rubygem-responders2-rails52>=2.0:www/rubygem-responders2-rails52 \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ - rubygem-gitlab-default_value_for>=3.1.1:devel/rubygem-gitlab-default_value_for \ + rubygem-default_value_for32>=3.2.0<3.3.0:devel/rubygem-default_value_for32 \ + rubygem-pg>=1.1.0:databases/rubygem-pg \ rubygem-rugged>=0.28.0:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.1:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ - rubygem-devise-rails5>=4.6:devel/rubygem-devise-rails5 \ + rubygem-devise-rails52>=4.6:devel/rubygem-devise-rails52 \ rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \ rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth>=1.8:security/rubygem-omniauth \ @@ -56,7 +57,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-jwt21>=2.1.0:www/rubygem-jwt21 \ rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \ rubygem-akismet>=2.0:devel/rubygem-akismet \ - rubygem-devise-two-factor30-rails5>=3.0.0:security/rubygem-devise-two-factor30-rails5 \ + rubygem-devise-two-factor30-rails52>=3.0.0:security/rubygem-devise-two-factor30-rails52 \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \ @@ -74,11 +75,11 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.0.0.b.3:net/rubygem-apollo_upload_server \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ - rubygem-kaminari-rails5>=1.0:www/rubygem-kaminari-rails5 \ + rubygem-kaminari-rails52>=1.0:www/rubygem-kaminari-rails52 \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.0:www/rubygem-carrierwave \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ - rubygem-fog-aws>=3.3:net/rubygem-fog-aws \ + rubygem-fog-aws>=3.5:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.8:net/rubygem-fog-google \ rubygem-fog-local>=0.6:net/rubygem-fog-local \ @@ -98,10 +99,10 @@ MY_DEPENDS= git>=2.21.0: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.8:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor>=2.0.10:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.3.1:textproc/rubygem-asciidoctor-include-ext \ - rubygem-asciidoctor-plantuml008>=0.0.8:textproc/rubygem-asciidoctor-plantuml008 \ - rubygem-rouge>=3.1:textproc/rubygem-rouge \ + rubygem-asciidoctor-plantuml>=0.0.9:textproc/rubygem-asciidoctor-plantuml \ + rubygem-rouge>=3.5:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.10.3:textproc/rubygem-nokogiri \ @@ -129,7 +130,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-version_sorter>=2.2.4:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.1.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis-rails-rails5>=5.0.1:www/rubygem-redis-rails-rails5 \ + rubygem-redis-rails-rails52>=5.0.1:www/rubygem-redis-rails-rails52 \ 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 \ @@ -152,33 +153,35 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-chronic>=0.10.2:devel/rubygem-chronic \ rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \ - rubygem-webpack-rails-rails5>=0.9.10:www/rubygem-webpack-rails-rails5 \ + rubygem-webpack-rails-rails52>=0.9.10:www/rubygem-webpack-rails-rails52 \ rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \ rubygem-sassc-rails>=2.1.0:textproc/rubygem-sassc-rails \ rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable25>=2.5.2:www/rubygem-addressable25 \ - rubygem-font-awesome-rails-rails5>=4.7:devel/rubygem-font-awesome-rails-rails5 \ + rubygem-font-awesome-rails-rails52>=4.7:devel/rubygem-font-awesome-rails-rails52 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ - rubygem-gon-rails5>=6.2.0:www/rubygem-gon-rails5 \ + rubygem-gon-rails52>=6.2.0:www/rubygem-gon-rails52 \ rubygem-request_store>=1.3:devel/rubygem-request_store \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-base32>=0.3.0:converters/rubygem-base32 \ rubygem-sentry-raven>=2.9:devel/rubygem-sentry-raven \ - rubygem-premailer-rails19-rails5>=1.9.7:mail/rubygem-premailer-rails19-rails5 \ + rubygem-premailer-rails19-rails52>=1.9.7:mail/rubygem-premailer-rails19-rails52 \ rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \ rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \ - rubygem-rails-i18n-rails5>=5.1.0:devel/rubygem-rails-i18n-rails5 \ + rubygem-rails-i18n-rails52>=5.1.0:devel/rubygem-rails-i18n-rails52 \ rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \ - rubygem-gettext_i18n_rails_js-rails5>=1.3:devel/rubygem-gettext_i18n_rails_js-rails5 \ + rubygem-gettext_i18n_rails_js-rails52>=1.3:devel/rubygem-gettext_i18n_rails_js-rails52 \ rubygem-gettext>=3.2.2:devel/rubygem-gettext \ rubygem-batch-loader>=1.4.0:devel/rubygem-batch-loader \ - rubygem-peek-rails5>=1.0.1:devel/rubygem-peek-rails5 \ - rubygem-peek-gc-rails5>=0.0.2:devel/rubygem-peek-gc-rails5 \ - rubygem-peek-rblineprof-rails5>=0.2.0:devel/rubygem-peek-rblineprof-rails5 \ - rubygem-peek-redis-rails5>=1.2.0:devel/rubygem-peek-redis-rails5 \ + rubygem-peek-rails52>=1.0.1:devel/rubygem-peek-rails52 \ + rubygem-peek-gc-rails52>=0.0.2:devel/rubygem-peek-gc-rails52 \ + rubygem-peek-pg-rails52>=1.3.0:databases/rubygem-peek-pg-rails52 \ + rubygem-peek-rblineprof-rails52>=0.2.0:devel/rubygem-peek-rblineprof-rails52 \ + rubygem-peek-redis-rails52>=1.2.0:devel/rubygem-peek-redis-rails52 \ + rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \ rubygem-method_source>=0.8:devel/rubygem-method_source \ rubygem-influxdb>=0.2:databases/rubygem-influxdb \ - rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \ + rubygem-prometheus-client-mmap>=0.9.8:devel/rubygem-prometheus-client-mmap \ rubygem-octokit>=4.9:net/rubygem-octokit \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ @@ -189,14 +192,14 @@ MY_DEPENDS= git>=2.21.0:devel/git \ rubygem-benchmark-memory>=0.1:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ - rubygem-health_check26-rails5>=2.6.0:devel/rubygem-health_check26-rails5 \ + rubygem-health_check26-rails52>=2.6.0:devel/rubygem-health_check26-rails52 \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ - rubygem-net-ssh>=5.0:security/rubygem-net-ssh \ + rubygem-net-ssh>=5.2:security/rubygem-net-ssh \ 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.32.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.37.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.19.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371 \ @@ -204,7 +207,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \ 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-rails5>=0.5:www/rubygem-lograge-rails5 \ + rubygem-lograge-rails52>=0.5:www/rubygem-lograge-rails52 \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -218,24 +221,13 @@ CONFLICTS_INSTALL= gitolite-* \ gitea-* \ ${PYTHON_PKGNAMEPREFIX}-gitosis-* -OPTIONS_SINGLE= DATABASE -OPTIONS_SINGLE_DATABASE= PGSQL MYSQL -OPTIONS_DEFAULT= PGSQL -PGSQL_DESC= Default PostgreSQL support (preferred) -MYSQL_DESC= Optional MySQL support - -PGSQL_RUN_DEPENDS= rubygem-pg>=1.1.0:databases/rubygem-pg \ - rubygem-peek-pg-rails5>=1.3.0:databases/rubygem-peek-pg-rails5 -MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \ - rubygem-peek-mysql2-rails5>=1.2.0:databases/rubygem-peek-mysql2-rails5 - USE_RUBY= yes USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 914bed6c7a7182a2affcd8f399e257b950e6bace +GL_COMMIT= 99e208281768e5414e3be694023c3e776efb1e24 USERS= git GROUPS= git @@ -245,25 +237,13 @@ NO_BUILD= yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ + ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/config/unicorn.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl -post-patch-MYSQL-on: - ${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample - -post-patch-MYSQL-off: - ${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile - ${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile - -post-patch-PGSQL-on: - ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample - -post-patch-PGSQL-off: - ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile - ${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile - do-install: + ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete @@ -272,6 +252,7 @@ do-install: ${FIND} ${WRKSRC} -name "Gemfile.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/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/distinfo Fri Aug 30 07:50:54 2019 (r510253) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565694542 -SHA256 (gitlab-org-gitlab-ce-914bed6c7a7182a2affcd8f399e257b950e6bace_GL0.tar.gz) = 47eafecc6df000820ae8f49ec1a2466901508b8cfa8fdc94db39d6fed75b624a -SIZE (gitlab-org-gitlab-ce-914bed6c7a7182a2affcd8f399e257b950e6bace_GL0.tar.gz) = 76513584 +TIMESTAMP = 1567142558 +SHA256 (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 5ae014172ecd2af590c2ad4943023b486c5631e5345deeec8267eccb7bcd7d50 +SIZE (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 80893091 Modified: head/www/gitlab-ce/files/gitlab.in ============================================================================== --- head/www/gitlab-ce/files/gitlab.in Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/files/gitlab.in Fri Aug 30 07:50:54 2019 (r510253) @@ -48,6 +48,7 @@ load_rc_config $name ### Environment variables RAILS_ENV="production" +EXPERIMENTAL_PUMA="" # Script variable names should be lower-case not to conflict with # internal /bin/sh variables such as PATH, EDITOR or SHELL. @@ -64,7 +65,7 @@ else mail_room_enabled=false fi mail_room_pid_path="$pid_path/mail_room.pid" -gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) +gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd) gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" if checkyesno gitlab_workhorse_tcp; then gitlab_workhorse_listen="-listenNetwork tcp -listenAddr $gitlab_workhorse_addr" @@ -150,7 +151,14 @@ if ! cd "$app_root" ; then echo "Failed to cd into $app_root, exiting!"; exit 1 fi +# Select the web server to use +if [ -z "$EXPERIMENTAL_PUMA" ]; then + use_web_server="unicorn" +else + use_web_server="puma" +fi + ### Init Script functions ## Gets the pids from the files @@ -159,7 +167,7 @@ check_pids(){ echo "Could not create the path $pid_path needed to store the pids." exit 1 fi - # If there exists a file which should hold the value of the Unicorn pid: read it. + # If there exists a file which should hold the value of the web server pid: read it. if [ -f "$web_server_pid_path" ]; then wpid=$(cat "$web_server_pid_path") else @@ -282,7 +290,7 @@ check_stale_pids(){ # If there is a pid it is something else than 0, the service is running if # *_status is == 0. if [ "$wpid" != "0" ] && [ "$web_status" != "0" ]; then - echo "Removing stale Unicorn web server pid. This is most likely caused by the web server crashing the last time it ran." + echo "Removing stale web server pid. This is most likely caused by the web server crashing the last time it ran." if ! rm "$web_server_pid_path"; then echo "Unable to remove stale pid, exiting." exit 1 @@ -334,12 +342,12 @@ exit_if_not_running(){ fi } -## Starts Unicorn and Sidekiq if they're not running. +## Starts web server and Sidekiq if they're not running. start_gitlab() { check_stale_pids if [ "$web_status" != "0" ]; then - echo "Starting GitLab Unicorn" + echo "Starting GitLab web server ($use_web_server)" fi if [ "$sidekiq_status" != "0" ]; then echo "Starting GitLab Sidekiq" @@ -359,12 +367,12 @@ start_gitlab() { # Then check if the service is running. If it is: don't start again. if [ "$web_status" = "0" ]; then - echo "The Unicorn web server already running with pid $wpid, not restarting." + echo "The web server already running with pid $wpid, not restarting." else # Remove old socket if it exists - rm -f "$socket_path"/gitlab.socket 2>/dev/null + rm -f "$rails_socket" 2>/dev/null # Start the web server - RAILS_ENV=$RAILS_ENV bin/web start + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web start fi # If sidekiq is already running, don't start it again. @@ -420,13 +428,13 @@ start_gitlab() { print_status } -## Asks Unicorn, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them. +## Asks web server, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them. stop_gitlab() { exit_if_not_running if [ "$web_status" = "0" ]; then - echo "Shutting down GitLab Unicorn" - RAILS_ENV=$RAILS_ENV bin/web stop + echo "Shutting down GitLab web server" + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web stop fi if [ "$sidekiq_status" = "0" ]; then echo "Shutting down GitLab Sidekiq" @@ -482,9 +490,9 @@ print_status() { return fi if [ "$web_status" = "0" ]; then - echo "The GitLab Unicorn web server with pid $wpid is running." + echo "The GitLab web server with pid $wpid is running." else - printf "The GitLab Unicorn web server is \033[31mnot running\033[0m.\n" + printf "The GitLab web server is \033[31mnot running\033[0m.\n" fi if [ "$sidekiq_status" = "0" ]; then echo "The GitLab Sidekiq job dispatcher with pid $spid is running." @@ -522,15 +530,15 @@ print_status() { fi } -## Tells unicorn to reload its config and Sidekiq to restart +## Tells web server to reload its config and Sidekiq to restart reload_gitlab(){ exit_if_not_running if [ "$wpid" = "0" ];then - echo "The GitLab Unicorn Web server is not running thus its configuration can't be reloaded." + echo "The GitLab web server Web server is not running thus its configuration can't be reloaded." exit 1 fi - printf "Reloading GitLab Unicorn configuration... " - RAILS_ENV=$RAILS_ENV bin/web reload + printf "Reloading GitLab web server configuration... " + RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web reload echo "Done." echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..." @@ -545,7 +553,7 @@ reload_gitlab(){ print_status } -## Restarts Sidekiq and Unicorn. +## Restarts Sidekiq and web server. restart_gitlab(){ check_status if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; then Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/files/patch-Gemfile Fri Aug 30 07:50:54 2019 (r510253) @@ -1,26 +1,41 @@ ---- Gemfile.orig 2019-07-01 15:47:59 UTC +--- Gemfile.orig 2019-08-12 15:15:49 UTC +++ Gemfile -@@ -14,7 +14,7 @@ gem 'sprockets', '~> 3.7.0' - gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +@@ -14,7 +14,6 @@ gem 'sprockets', '~> 3.7.0' + gem 'default_value_for', '~> 3.2.0' # Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql -+gem 'mysql2', '>= 0.4.10', group: :mysql gem 'pg', '~> 1.1', group: :postgres gem 'rugged', '~> 0.28' -@@ -209,7 +209,7 @@ gem 'connection_pool', '~> 2.0' +@@ -84,7 +83,6 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' + gem 'graphql', '~> 1.8.0' + gem 'graphiql-rails', '~> 1.4.10' + gem 'apollo_upload_server', '~> 2.0.0.beta3' +-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] + + # Disable strong_params so that Mash does not respond to :permitted? + gem 'hashie-forbidden_attributes' +@@ -210,7 +208,7 @@ gem 'connection_pool', '~> 2.0' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration -gem 'hipchat', '~> 1.5.0' +gem 'hipchat', '~> 1.6.0' - # JIRA integration + # Jira integration gem 'jira-ruby', '~> 1.4' -@@ -308,89 +308,6 @@ group :metrics do +@@ -296,7 +294,6 @@ gem 'batch-loader', '~> 1.4.0' + # Perf bar + gem 'peek', '~> 1.0.1' + gem 'peek-gc', '~> 0.0.2' +-gem 'peek-mysql2', '~> 1.2.0', group: :mysql + gem 'peek-pg', '~> 1.3.0', group: :postgres + gem 'peek-rblineprof', '~> 0.2.0' + gem 'peek-redis', '~> 1.2.0' +@@ -312,89 +309,6 @@ group :metrics do # Prometheus - gem 'prometheus-client-mmap', '~> 0.9.4' + gem 'prometheus-client-mmap', '~> 0.9.8' gem 'raindrops', '~> 0.18' -end - @@ -50,7 +65,7 @@ - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 4.8.2' -- gem 'rspec-rails', '~> 3.7.0' +- gem 'rspec-rails', '~> 3.8.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' @@ -79,6 +94,7 @@ - gem 'haml_lint', '~> 0.31.0', require: false - gem 'simplecov', '~> 0.16.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false +- gem 'mdl', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - @@ -88,7 +104,6 @@ - gem 'activerecord_sane_schema_dumper', '1.0' - - gem 'stackprof', '~> 0.2.10', require: false -- gem 'derailed_benchmarks', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false - Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab-ce/files/patch-config_gitlab.yml.example Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example Fri Aug 30 07:50:54 2019 (r510253) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2019-04-19 09:51:35 UTC +--- config/gitlab.yml.example.orig 2019-07-26 17:57:42 UTC +++ config/gitlab.yml.example -@@ -248,7 +248,7 @@ production: &base +@@ -287,7 +287,7 @@ production: &base # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages admin: @@ -9,7 +9,7 @@ ## Mattermost ## For enabling Add to Mattermost button -@@ -649,7 +649,7 @@ production: &base +@@ -832,7 +832,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,7 +18,7 @@ # 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. -@@ -667,8 +667,8 @@ production: &base +@@ -850,8 +850,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -29,7 +29,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -700,12 +700,12 @@ production: &base +@@ -897,12 +897,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -726,7 +726,7 @@ production: &base +@@ -923,7 +923,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 Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Fri Aug 30 07:50:54 2019 (r510253) @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2019-04-19 09:51:35 UTC +--- config/initializers/1_settings.rb.orig 2019-07-26 17:57:42 UTC +++ config/initializers/1_settings.rb -@@ -145,12 +145,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA +@@ -174,12 +174,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' Added: head/www/gitlab-ce/files/patch-config_puma.rb.example ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/gitlab-ce/files/patch-config_puma.rb.example Fri Aug 30 07:50:54 2019 (r510253) @@ -0,0 +1,34 @@ +--- config/puma.rb.example.orig 2019-08-17 12:35:36 UTC ++++ config/puma.rb.example +@@ -5,11 +5,11 @@ + # The default is "config.ru". + # + rackup 'config.ru' +-pidfile '/home/git/gitlab/tmp/pids/puma.pid' +-state_path '/home/git/gitlab/tmp/pids/puma.state' ++pidfile '%%PREFIX%%/www/gitlab-ce/tmp/pids/puma.pid' ++state_path '%%PREFIX%%/www/gitlab-ce/tmp/pids/puma.state' + +-stdout_redirect '/home/git/gitlab/log/puma.stdout.log', +- '/home/git/gitlab/log/puma.stderr.log', ++stdout_redirect '%%PREFIX%%/www/gitlab-ce/log/puma.stdout.log', ++ '%%PREFIX%%/www/gitlab-ce/log/puma.stderr.log', + true + + # Configure "min" to be the minimum number of threads to use to answer +@@ -31,12 +31,12 @@ queue_requests false + + # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only + # accepted protocols. +-bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket' ++bind 'unix://%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket' + + workers 3 + +-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" +-require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer" ++require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events" ++require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/puma_worker_killer_initializer" + + on_restart do + # Signal application hooks that we're about to restart Modified: head/www/gitlab-ce/pkg-message ============================================================================== --- head/www/gitlab-ce/pkg-message Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/pkg-message Fri Aug 30 07:50:54 2019 (r510253) @@ -6,7 +6,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: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.0-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.1-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 11.8.x to 11.9.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.11-12.0-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.0-12.1-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: Modified: head/www/gitlab-ce/pkg-plist ============================================================================== --- head/www/gitlab-ce/pkg-plist Fri Aug 30 07:37:26 2019 (r510252) +++ head/www/gitlab-ce/pkg-plist Fri Aug 30 07:50:54 2019 (r510253) @@ -12,6 +12,7 @@ %%WWWDIR%%/.gitlab/ci/docs.gitlab-ci.yml %%WWWDIR%%/.gitlab/ci/frontend.gitlab-ci.yml %%WWWDIR%%/.gitlab/ci/global.gitlab-ci.yml +%%WWWDIR%%/.gitlab/ci/memory.gitlab-ci.yml %%WWWDIR%%/.gitlab/ci/pages.gitlab-ci.yml %%WWWDIR%%/.gitlab/ci/qa.gitlab-ci.yml %%WWWDIR%%/.gitlab/ci/rails.gitlab-ci.yml @@ -23,7 +24,6 @@ %%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 Flag Roll Out.md @@ -40,6 +40,8 @@ %%WWWDIR%%/.haml-lint.yml %%WWWDIR%%/.haml-lint_todo.yml %%WWWDIR%%/.mailmap +%%WWWDIR%%/.mdlrc +%%WWWDIR%%/.mdlrc.style %%WWWDIR%%/.nvmrc %%WWWDIR%%/.pkgr.yml %%WWWDIR%%/.prettierignore @@ -80,6 +82,7 @@ %%WWWDIR%%/app/assets/images/auth_buttons/gitlab_64.png %%WWWDIR%%/app/assets/images/auth_buttons/google_64.png %%WWWDIR%%/app/assets/images/auth_buttons/jwt_64.png +%%WWWDIR%%/app/assets/images/auth_buttons/salesforce_64.png %%WWWDIR%%/app/assets/images/auth_buttons/shibboleth_64.png %%WWWDIR%%/app/assets/images/auth_buttons/signin_with_google.png %%WWWDIR%%/app/assets/images/auth_buttons/twitter_64.png @@ -2073,9 +2076,11 @@ %%WWWDIR%%/app/assets/javascripts/boards/components/board_blank_state.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_card.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_delete.js +%%WWWDIR%%/app/assets/javascripts/boards/components/board_form.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_list.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_new_issue.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_sidebar.js +%%WWWDIR%%/app/assets/javascripts/boards/components/boards_selector.vue %%WWWDIR%%/app/assets/javascripts/boards/components/issue_card_inner.vue %%WWWDIR%%/app/assets/javascripts/boards/components/issue_card_inner_scoped_label.vue %%WWWDIR%%/app/assets/javascripts/boards/components/issue_due_date.vue @@ -2091,11 +2096,13 @@ %%WWWDIR%%/app/assets/javascripts/boards/components/new_list_dropdown.js %%WWWDIR%%/app/assets/javascripts/boards/components/project_select.vue %%WWWDIR%%/app/assets/javascripts/boards/components/sidebar/remove_issue.vue +%%WWWDIR%%/app/assets/javascripts/boards/config_toggle.js %%WWWDIR%%/app/assets/javascripts/boards/eventhub.js %%WWWDIR%%/app/assets/javascripts/boards/filtered_search_boards.js %%WWWDIR%%/app/assets/javascripts/boards/filters/due_date_filters.js %%WWWDIR%%/app/assets/javascripts/boards/index.js %%WWWDIR%%/app/assets/javascripts/boards/mixins/issue_card_inner.js +%%WWWDIR%%/app/assets/javascripts/boards/mixins/modal_footer.js %%WWWDIR%%/app/assets/javascripts/boards/mixins/modal_mixins.js %%WWWDIR%%/app/assets/javascripts/boards/mixins/sortable_default_options.js %%WWWDIR%%/app/assets/javascripts/boards/models/assignee.js @@ -2104,6 +2111,7 @@ %%WWWDIR%%/app/assets/javascripts/boards/models/list.js %%WWWDIR%%/app/assets/javascripts/boards/models/milestone.js %%WWWDIR%%/app/assets/javascripts/boards/models/project.js +%%WWWDIR%%/app/assets/javascripts/boards/mount_multiple_boards_switcher.js %%WWWDIR%%/app/assets/javascripts/boards/services/board_service.js %%WWWDIR%%/app/assets/javascripts/boards/stores/actions.js %%WWWDIR%%/app/assets/javascripts/boards/stores/boards_store.js @@ -2113,7 +2121,12 @@ %%WWWDIR%%/app/assets/javascripts/boards/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/boards/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/boards/stores/state.js +%%WWWDIR%%/app/assets/javascripts/boards/toggle_focus.js %%WWWDIR%%/app/assets/javascripts/branches/branches_delete_modal.js +%%WWWDIR%%/app/assets/javascripts/branches/components/divergence_graph.vue +%%WWWDIR%%/app/assets/javascripts/branches/components/graph_bar.vue +%%WWWDIR%%/app/assets/javascripts/branches/constants.js +%%WWWDIR%%/app/assets/javascripts/branches/divergence_graph.js %%WWWDIR%%/app/assets/javascripts/breadcrumb.js %%WWWDIR%%/app/assets/javascripts/breakpoints.js %%WWWDIR%%/app/assets/javascripts/build_artifacts.js @@ -2142,6 +2155,7 @@ %%WWWDIR%%/app/assets/javascripts/commons/bootstrap.js %%WWWDIR%%/app/assets/javascripts/commons/index.js %%WWWDIR%%/app/assets/javascripts/commons/jquery.js +%%WWWDIR%%/app/assets/javascripts/commons/nav/user_merge_requests.js %%WWWDIR%%/app/assets/javascripts/commons/polyfills.js %%WWWDIR%%/app/assets/javascripts/commons/polyfills/custom_event.js %%WWWDIR%%/app/assets/javascripts/commons/polyfills/element.js @@ -2151,6 +2165,10 @@ %%WWWDIR%%/app/assets/javascripts/commons/polyfills/svg.js %%WWWDIR%%/app/assets/javascripts/commons/vue.js %%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/confidential_merge_request/components/dropdown.vue +%%WWWDIR%%/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue +%%WWWDIR%%/app/assets/javascripts/confidential_merge_request/index.js +%%WWWDIR%%/app/assets/javascripts/confidential_merge_request/state.js %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js %%WWWDIR%%/app/assets/javascripts/contextual_sidebar.js %%WWWDIR%%/app/assets/javascripts/create_item_dropdown.js @@ -2200,6 +2218,7 @@ %%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/compare_versions_dropdown.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_content.vue +%%WWWDIR%%/app/assets/javascripts/diffs/components/diff_discussion_reply.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_discussions.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file.vue %%WWWDIR%%/app/assets/javascripts/diffs/components/diff_file_header.vue @@ -2550,10 +2569,11 @@ %%WWWDIR%%/app/assets/javascripts/issuable_context.js %%WWWDIR%%/app/assets/javascripts/issuable_form.js %%WWWDIR%%/app/assets/javascripts/issuable_index.js +%%WWWDIR%%/app/assets/javascripts/issuable_init_bulk_update_sidebar.js %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/components/app.vue %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/components/item.vue %%WWWDIR%%/app/assets/javascripts/issuable_suggestions/index.js -%%WWWDIR%%/app/assets/javascripts/issuable_suggestions/queries/issues.graphql +%%WWWDIR%%/app/assets/javascripts/issuable_suggestions/queries/issues.query.graphql %%WWWDIR%%/app/assets/javascripts/issue.js %%WWWDIR%%/app/assets/javascripts/issue_show/components/app.vue %%WWWDIR%%/app/assets/javascripts/issue_show/components/description.vue @@ -2651,6 +2671,8 @@ %%WWWDIR%%/app/assets/javascripts/locale/sprintf.js %%WWWDIR%%/app/assets/javascripts/logo.js %%WWWDIR%%/app/assets/javascripts/main.js +%%WWWDIR%%/app/assets/javascripts/main_ee.js +%%WWWDIR%%/app/assets/javascripts/manual_ordering.js %%WWWDIR%%/app/assets/javascripts/member_expiration_date.js %%WWWDIR%%/app/assets/javascripts/members.js %%WWWDIR%%/app/assets/javascripts/merge_conflicts/components/diff_file_editor.js @@ -2670,10 +2692,12 @@ %%WWWDIR%%/app/assets/javascripts/mirrors/mirror_repos.js %%WWWDIR%%/app/assets/javascripts/mirrors/ssh_mirror.js %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/area.vue +%%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/column.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/charts/single_stat.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/dashboard.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph_group.vue +%%WWWDIR%%/app/assets/javascripts/monitoring/components/panel_type.vue %%WWWDIR%%/app/assets/javascripts/monitoring/constants.js %%WWWDIR%%/app/assets/javascripts/monitoring/monitoring_bundle.js %%WWWDIR%%/app/assets/javascripts/monitoring/stores/actions.js @@ -2694,7 +2718,7 @@ %%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/mr_popover/queries/merge_request.query.graphql %%WWWDIR%%/app/assets/javascripts/namespace_select.js %%WWWDIR%%/app/assets/javascripts/namespaces/leave_by_url.js %%WWWDIR%%/app/assets/javascripts/network/branch_graph.js @@ -2721,6 +2745,7 @@ %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_jump_to_next_button.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_locked_widget.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_notes.vue +%%WWWDIR%%/app/assets/javascripts/notes/components/discussion_notes_replies_wrapper.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_reply_placeholder.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_resolve_button.vue %%WWWDIR%%/app/assets/javascripts/notes/components/discussion_resolve_with_issue_button.vue @@ -2974,6 +2999,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/constants.js %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/external.js %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/mixins/settings_pannel_mixin.js %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/save_project_loader.js %%WWWDIR%%/app/assets/javascripts/pages/projects/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/snippets/edit/index.js @@ -3011,7 +3037,6 @@ %%WWWDIR%%/app/assets/javascripts/performance_bar/components/detailed_metric.vue %%WWWDIR%%/app/assets/javascripts/performance_bar/components/performance_bar_app.vue %%WWWDIR%%/app/assets/javascripts/performance_bar/components/request_selector.vue -%%WWWDIR%%/app/assets/javascripts/performance_bar/components/simple_metric.vue %%WWWDIR%%/app/assets/javascripts/performance_bar/index.js %%WWWDIR%%/app/assets/javascripts/performance_bar/services/performance_bar_service.js %%WWWDIR%%/app/assets/javascripts/performance_bar/stores/performance_bar_store.js @@ -3077,6 +3102,7 @@ %%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/state.js %%WWWDIR%%/app/assets/javascripts/projects/project_import_gitlab_project.js %%WWWDIR%%/app/assets/javascripts/projects/project_new.js +%%WWWDIR%%/app/assets/javascripts/projects/projects_filterable_list.js %%WWWDIR%%/app/assets/javascripts/projects/tree/components/commit_pipeline_status_component.vue %%WWWDIR%%/app/assets/javascripts/projects/tree/services/commit_pipeline_service.js %%WWWDIR%%/app/assets/javascripts/projects_list.js @@ -3096,6 +3122,7 @@ %%WWWDIR%%/app/assets/javascripts/ref_select_dropdown.js %%WWWDIR%%/app/assets/javascripts/registry/components/app.vue %%WWWDIR%%/app/assets/javascripts/registry/components/collapsible_container.vue +%%WWWDIR%%/app/assets/javascripts/registry/components/svg_message.vue %%WWWDIR%%/app/assets/javascripts/registry/components/table_registry.vue %%WWWDIR%%/app/assets/javascripts/registry/constants.js %%WWWDIR%%/app/assets/javascripts/registry/index.js @@ -3141,6 +3168,7 @@ %%WWWDIR%%/app/assets/javascripts/reports/store/utils.js %%WWWDIR%%/app/assets/javascripts/repository/components/app.vue %%WWWDIR%%/app/assets/javascripts/repository/components/breadcrumbs.vue +%%WWWDIR%%/app/assets/javascripts/repository/components/last_commit.vue %%WWWDIR%%/app/assets/javascripts/repository/components/table/header.vue %%WWWDIR%%/app/assets/javascripts/repository/components/table/index.vue %%WWWDIR%%/app/assets/javascripts/repository/components/table/parent_row.vue @@ -3148,13 +3176,18 @@ %%WWWDIR%%/app/assets/javascripts/repository/fragmentTypes.json %%WWWDIR%%/app/assets/javascripts/repository/graphql.js %%WWWDIR%%/app/assets/javascripts/repository/index.js +%%WWWDIR%%/app/assets/javascripts/repository/log_tree.js %%WWWDIR%%/app/assets/javascripts/repository/mixins/get_ref.js %%WWWDIR%%/app/assets/javascripts/repository/pages/index.vue %%WWWDIR%%/app/assets/javascripts/repository/pages/tree.vue -%%WWWDIR%%/app/assets/javascripts/repository/queries/getFiles.graphql -%%WWWDIR%%/app/assets/javascripts/repository/queries/getProjectPath.graphql -%%WWWDIR%%/app/assets/javascripts/repository/queries/getProjectShortPath.graphql -%%WWWDIR%%/app/assets/javascripts/repository/queries/getRef.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getCommit.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getCommits.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getFiles.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getPermissions.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getProjectPath.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getProjectShortPath.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/getRef.query.graphql +%%WWWDIR%%/app/assets/javascripts/repository/queries/pathLastCommit.query.graphql %%WWWDIR%%/app/assets/javascripts/repository/router.js %%WWWDIR%%/app/assets/javascripts/repository/utils/icon.js %%WWWDIR%%/app/assets/javascripts/repository/utils/title.js @@ -3379,6 +3412,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/skeleton_note.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/system_note.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/timeline_entry_item.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/paginated_list.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pagination/constants.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pagination/graphql_pagination.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pagination/table_pagination.vue @@ -3423,7 +3457,6 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/directives/popover.js %%WWWDIR%%/app/assets/javascripts/vue_shared/directives/tooltip.js %%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js -%%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/is_ee.js %%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/issuable.js %%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/recaptcha_modal_implementor.js %%WWWDIR%%/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js @@ -3439,7 +3472,6 @@ %%WWWDIR%%/app/assets/javascripts/zen_mode.js %%WWWDIR%%/app/assets/stylesheets/application.scss %%WWWDIR%%/app/assets/stylesheets/behaviors.scss -%%WWWDIR%%/app/assets/stylesheets/bootstrap.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss %%WWWDIR%%/app/assets/stylesheets/components/avatar.scss %%WWWDIR%%/app/assets/stylesheets/components/dashboard_skeleton.scss @@ -3452,7 +3484,6 @@ %%WWWDIR%%/app/assets/stylesheets/errors.scss %%WWWDIR%%/app/assets/stylesheets/framework.scss %%WWWDIR%%/app/assets/stylesheets/framework/animations.scss -%%WWWDIR%%/app/assets/stylesheets/framework/asciidoctor.scss %%WWWDIR%%/app/assets/stylesheets/framework/awards.scss %%WWWDIR%%/app/assets/stylesheets/framework/badges.scss %%WWWDIR%%/app/assets/stylesheets/framework/banner.scss @@ -3657,6 +3688,7 @@ %%WWWDIR%%/app/controllers/concerns/members_presentation.rb %%WWWDIR%%/app/controllers/concerns/membership_actions.rb %%WWWDIR%%/app/controllers/concerns/milestone_actions.rb +%%WWWDIR%%/app/controllers/concerns/multiple_boards_actions.rb %%WWWDIR%%/app/controllers/concerns/notes_actions.rb %%WWWDIR%%/app/controllers/concerns/oauth_applications.rb %%WWWDIR%%/app/controllers/concerns/params_backward_compatibility.rb @@ -3800,6 +3832,7 @@ %%WWWDIR%%/app/controllers/projects/mattermosts_controller.rb %%WWWDIR%%/app/controllers/projects/merge_requests/application_controller.rb %%WWWDIR%%/app/controllers/projects/merge_requests/conflicts_controller.rb +%%WWWDIR%%/app/controllers/projects/merge_requests/content_controller.rb %%WWWDIR%%/app/controllers/projects/merge_requests/creations_controller.rb %%WWWDIR%%/app/controllers/projects/merge_requests/diffs_controller.rb %%WWWDIR%%/app/controllers/projects/merge_requests_controller.rb @@ -3870,6 +3903,7 @@ %%WWWDIR%%/app/finders/autocomplete/project_finder.rb %%WWWDIR%%/app/finders/autocomplete/users_finder.rb %%WWWDIR%%/app/finders/awarded_emoji_finder.rb +%%WWWDIR%%/app/finders/boards/visits_finder.rb %%WWWDIR%%/app/finders/branches_finder.rb %%WWWDIR%%/app/finders/cluster_ancestors_finder.rb %%WWWDIR%%/app/finders/clusters/knative_services_finder.rb @@ -3921,11 +3955,21 @@ %%WWWDIR%%/app/graphql/functions/base_function.rb %%WWWDIR%%/app/graphql/functions/echo.rb %%WWWDIR%%/app/graphql/gitlab_schema.rb -%%WWWDIR%%/app/graphql/mutations/.keep +%%WWWDIR%%/app/graphql/mutations/award_emojis/add.rb +%%WWWDIR%%/app/graphql/mutations/award_emojis/base.rb +%%WWWDIR%%/app/graphql/mutations/award_emojis/remove.rb +%%WWWDIR%%/app/graphql/mutations/award_emojis/toggle.rb %%WWWDIR%%/app/graphql/mutations/base_mutation.rb %%WWWDIR%%/app/graphql/mutations/concerns/mutations/resolves_project.rb %%WWWDIR%%/app/graphql/mutations/merge_requests/base.rb %%WWWDIR%%/app/graphql/mutations/merge_requests/set_wip.rb +%%WWWDIR%%/app/graphql/mutations/notes/base.rb +%%WWWDIR%%/app/graphql/mutations/notes/create/base.rb +%%WWWDIR%%/app/graphql/mutations/notes/create/diff_note.rb +%%WWWDIR%%/app/graphql/mutations/notes/create/image_diff_note.rb +%%WWWDIR%%/app/graphql/mutations/notes/create/note.rb +%%WWWDIR%%/app/graphql/mutations/notes/destroy.rb +%%WWWDIR%%/app/graphql/mutations/notes/update.rb %%WWWDIR%%/app/graphql/resolvers/base_resolver.rb %%WWWDIR%%/app/graphql/resolvers/concerns/resolves_pipelines.rb %%WWWDIR%%/app/graphql/resolvers/full_path_resolver.rb @@ -3939,6 +3983,7 @@ %%WWWDIR%%/app/graphql/resolvers/project_pipelines_resolver.rb %%WWWDIR%%/app/graphql/resolvers/project_resolver.rb %%WWWDIR%%/app/graphql/resolvers/tree_resolver.rb +%%WWWDIR%%/app/graphql/types/award_emojis/award_emoji_type.rb %%WWWDIR%%/app/graphql/types/base_enum.rb %%WWWDIR%%/app/graphql/types/base_field.rb %%WWWDIR%%/app/graphql/types/base_input_object.rb @@ -3949,6 +3994,9 @@ %%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/commit_type.rb +%%WWWDIR%%/app/graphql/types/diff_paths_input_type.rb +%%WWWDIR%%/app/graphql/types/diff_refs_type.rb %%WWWDIR%%/app/graphql/types/group_type.rb %%WWWDIR%%/app/graphql/types/issuable_state_enum.rb %%WWWDIR%%/app/graphql/types/issue_state_enum.rb @@ -3960,6 +4008,9 @@ %%WWWDIR%%/app/graphql/types/milestone_type.rb %%WWWDIR%%/app/graphql/types/mutation_type.rb %%WWWDIR%%/app/graphql/types/namespace_type.rb +%%WWWDIR%%/app/graphql/types/notes/diff_image_position_input_type.rb +%%WWWDIR%%/app/graphql/types/notes/diff_position_base_input_type.rb +%%WWWDIR%%/app/graphql/types/notes/diff_position_input_type.rb %%WWWDIR%%/app/graphql/types/notes/diff_position_type.rb %%WWWDIR%%/app/graphql/types/notes/discussion_type.rb %%WWWDIR%%/app/graphql/types/notes/note_type.rb @@ -4055,6 +4106,7 @@ %%WWWDIR%%/app/helpers/notes_helper.rb %%WWWDIR%%/app/helpers/notifications_helper.rb %%WWWDIR%%/app/helpers/numbers_helper.rb +%%WWWDIR%%/app/helpers/onboarding_experiment_helper.rb %%WWWDIR%%/app/helpers/page_layout_helper.rb %%WWWDIR%%/app/helpers/pagination_helper.rb %%WWWDIR%%/app/helpers/performance_bar_helper.rb @@ -4063,6 +4115,7 @@ %%WWWDIR%%/app/helpers/profiles_helper.rb %%WWWDIR%%/app/helpers/projects/error_tracking_helper.rb %%WWWDIR%%/app/helpers/projects_helper.rb +%%WWWDIR%%/app/helpers/recaptcha_experiment_helper.rb %%WWWDIR%%/app/helpers/repository_languages_helper.rb %%WWWDIR%%/app/helpers/rss_helper.rb %%WWWDIR%%/app/helpers/runners_helper.rb @@ -4204,6 +4257,7 @@ %%WWWDIR%%/app/models/clusters/applications/prometheus.rb %%WWWDIR%%/app/models/clusters/applications/runner.rb %%WWWDIR%%/app/models/clusters/cluster.rb +%%WWWDIR%%/app/models/clusters/clusters_hierarchy.rb %%WWWDIR%%/app/models/clusters/concerns/application_core.rb %%WWWDIR%%/app/models/clusters/concerns/application_data.rb %%WWWDIR%%/app/models/clusters/concerns/application_status.rb @@ -4277,6 +4331,7 @@ %%WWWDIR%%/app/models/concerns/optionally_search.rb %%WWWDIR%%/app/models/concerns/participable.rb %%WWWDIR%%/app/models/concerns/presentable.rb +%%WWWDIR%%/app/models/concerns/project_api_compatibility.rb %%WWWDIR%%/app/models/concerns/project_features_compatibility.rb %%WWWDIR%%/app/models/concerns/project_services_loggable.rb %%WWWDIR%%/app/models/concerns/prometheus_adapter.rb @@ -4294,10 +4349,12 @@ %%WWWDIR%%/app/models/concerns/resolvable_note.rb %%WWWDIR%%/app/models/concerns/routable.rb %%WWWDIR%%/app/models/concerns/select_for_project_authorization.rb +%%WWWDIR%%/app/models/concerns/service_push_data_validations.rb %%WWWDIR%%/app/models/concerns/sha_attribute.rb %%WWWDIR%%/app/models/concerns/shardable.rb %%WWWDIR%%/app/models/concerns/sortable.rb %%WWWDIR%%/app/models/concerns/spammable.rb +%%WWWDIR%%/app/models/concerns/stepable.rb %%WWWDIR%%/app/models/concerns/storage/legacy_namespace.rb %%WWWDIR%%/app/models/concerns/storage/legacy_project_wiki.rb %%WWWDIR%%/app/models/concerns/storage/legacy_repository.rb @@ -4321,13 +4378,15 @@ %%WWWDIR%%/app/models/conversational_development_index/card.rb %%WWWDIR%%/app/models/conversational_development_index/idea_to_production_step.rb %%WWWDIR%%/app/models/conversational_development_index/metric.rb -%%WWWDIR%%/app/models/cycle_analytics.rb +%%WWWDIR%%/app/models/cycle_analytics/base.rb +%%WWWDIR%%/app/models/cycle_analytics/project_level.rb %%WWWDIR%%/app/models/dashboard_group_milestone.rb %%WWWDIR%%/app/models/dashboard_milestone.rb %%WWWDIR%%/app/models/deploy_key.rb %%WWWDIR%%/app/models/deploy_keys_project.rb %%WWWDIR%%/app/models/deploy_token.rb %%WWWDIR%%/app/models/deployment.rb +%%WWWDIR%%/app/models/deployment_metrics.rb %%WWWDIR%%/app/models/diff_discussion.rb %%WWWDIR%%/app/models/diff_note.rb %%WWWDIR%%/app/models/diff_viewer/added.rb @@ -4410,6 +4469,8 @@ %%WWWDIR%%/app/models/merge_requests_closing_issues.rb %%WWWDIR%%/app/models/milestone.rb %%WWWDIR%%/app/models/namespace.rb +%%WWWDIR%%/app/models/namespace/aggregation_schedule.rb +%%WWWDIR%%/app/models/namespace/root_storage_statistics.rb %%WWWDIR%%/app/models/network/commit.rb %%WWWDIR%%/app/models/network/graph.rb %%WWWDIR%%/app/models/note.rb @@ -4497,6 +4558,7 @@ %%WWWDIR%%/app/models/project_team.rb %%WWWDIR%%/app/models/project_wiki.rb %%WWWDIR%%/app/models/prometheus_metric.rb +%%WWWDIR%%/app/models/prometheus_metric_enums.rb %%WWWDIR%%/app/models/protectable_dropdown.rb %%WWWDIR%%/app/models/protected_branch.rb %%WWWDIR%%/app/models/protected_branch/merge_access_level.rb @@ -4553,6 +4615,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***