From owner-svn-ports-head@freebsd.org Wed Jul 4 17:38:33 2018 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 CCD2910284A8; Wed, 4 Jul 2018 17:38:32 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6FB6789D49; Wed, 4 Jul 2018 17:38:32 +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 35FFC6526; Wed, 4 Jul 2018 17:38:32 +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 w64HcWsw034736; Wed, 4 Jul 2018 17:38:32 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64HcThl034722; Wed, 4 Jul 2018 17:38:29 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201807041738.w64HcThl034722@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Wed, 4 Jul 2018 17:38:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473910 - in head: . www/gitlab 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 www/gitlab-ce www/gitlab-ce/files X-SVN-Commit-Revision: 473910 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 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: Wed, 04 Jul 2018 17:38:33 -0000 Author: mfechner Date: Wed Jul 4 17:38:29 2018 New Revision: 473910 URL: https://svnweb.freebsd.org/changeset/ports/473910 Log: Updated gitlab to 11.0.2. For detailed list of changes please see here: https://about.gitlab.com/2018/06/22/gitlab-11-0-released/ Please make sure before you upgrade you read the entry in UPDATING. Reviewed by: swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D16127 Added: head/www/gitlab-ce/ - copied from r473909, head/www/gitlab/ Deleted: head/www/gitlab/ head/www/gitlab-ce/files/patch-app_uploaders_object__storage.rb Modified: head/MOVED 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_unicorn.rb.example head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl head/www/gitlab-ce/pkg-message head/www/gitlab-ce/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Wed Jul 4 17:37:15 2018 (r473909) +++ head/MOVED Wed Jul 4 17:38:29 2018 (r473910) @@ -10320,3 +10320,4 @@ databases/mongodb34-rocks||2018-07-03|Has expired: Bro math/freemat||2018-07-03|Has expired: Complex, unmaintained software with obsolete dependencies dns/bind99|dns/bind911|2018-07-04|Has expired: Going out of support, please migrate to dns/bind911 dns/bind910|dns/bind911|2018-07-04|Has expired: Going out of support, please migrate to dns/bind911 +www/gitlab|www/gitlab-ce|2018-07-04|Port renamed to match name on gitlab.org Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 4 17:37:15 2018 (r473909) +++ head/UPDATING Wed Jul 4 17:38:29 2018 (r473910) @@ -5,6 +5,23 @@ 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. +20180704: + AFFECTS: users of www/gitlab + AUTHOR: mfechner@FreeBSD.org + + The gitlab port uses the package from gitlab.org instead of github.org. + For this the port was renamed from gitlab to gitlab-ce. + Please follow the instructions very carefully to not lose your data! + Not only the package was renamed, also the directory name changed. + + You can find the current instruction here: + https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.8-11.0-freebsd.md + + Please note the update was only tested for an update from 10.8.5 to 11.0.2. + If your version of gitlab was released before 2014-03-13 you cannot update + to this version. You need to make an intermediate update to an earlier + version before. + 20180701: AFFECTS: users of devel/bats AUTHOR: lifanov@FreeBSD.org Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab/Makefile Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/Makefile Wed Jul 4 17:38:29 2018 (r473910) @@ -1,9 +1,8 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ -PORTNAME= gitlab -PORTVERSION= 10.8.5 -DISTVERSIONPREFIX= v +PORTNAME= gitlab-ce +PORTVERSION= 11.0.2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -25,9 +24,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options RUN_DEPENDS= git>=2.16.2:devel/git \ - gitlab-shell>=7.1.2:devel/gitlab-shell \ - gitlab-workhorse>=4.1.0:www/gitlab-workhorse \ - gitaly>=0.100.0:devel/gitaly \ + gitlab-shell>=7.1.4:devel/gitlab-shell \ + gitlab-workhorse>=4.3.1:www/gitlab-workhorse \ + gitaly>=0.105.0:devel/gitaly \ gitlab-pages>=0.9.1:www/gitlab-pages \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ @@ -38,7 +37,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ rubygem-default_value_for30>=3.0.5:devel/rubygem-default_value_for30 \ rubygem-rugged>=0.27.0:devel/rubygem-rugged \ - rubygem-grape-route-helpers>=2.1.0:devel/rubygem-grape-route-helpers \ + rubygem-grape-path-helpers>=1.0:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.4:devel/rubygem-devise \ rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \ @@ -57,7 +56,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \ rubygem-omniauth-twitter>=1.4:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ - rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \ + rubygem-omniauth-authentiq>=0.3.3:net/rubygem-omniauth-authentiq \ rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ @@ -77,10 +76,13 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-grape>=1.0:devel/rubygem-grape \ rubygem-grape-entity>=0.7.1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \ + rubygem-graphql>=1.8.0:devel/rubygem-graphql \ + rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \ rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ + rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-fog-aws2>=2.0.1:net/rubygem-fog-aws2 \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ @@ -98,7 +100,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ rubygem-commonmarker>=0.17:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ - rubygem-rdoc>=4.2:devel/rubygem-rdoc \ + rubygem-rdoc>=6.0:devel/rubygem-rdoc \ 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 \ @@ -108,18 +110,20 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.8.2:textproc/rubygem-nokogiri \ + rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \ rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \ rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \ rubygem-state_machines-activerecord>=0.5.1:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=5.0:www/rubygem-acts-as-taggable-on \ - rubygem-sidekiq>=5.0.0:devel/rubygem-sidekiq \ + rubygem-sidekiq>=5.1.0:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \ - rubygem-redis-namespace15>=1.5.2:databases/rubygem-redis-namespace15 \ + rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \ rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow2>=2.2:devel/rubygem-rainbow2 \ + rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ @@ -134,8 +138,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-asana>=0.6.0:www/rubygem-asana \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ - rubygem-kubeclient>=3.0.0:www/rubygem-kubeclient \ - rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ + rubygem-kubeclient>=3.1.0:www/rubygem-kubeclient \ rubygem-sanitize>=4.6.5:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.2:textproc/rubygem-loofah \ @@ -144,7 +147,6 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ - rubygem-oj2>=2.17.4:devel/rubygem-oj2 \ 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 \ @@ -153,10 +155,9 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-sass-rails-rails4>=5.0.6:textproc/rubygem-sass-rails-rails4 \ rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable>=2.5.2:www/rubygem-addressable \ - rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \ rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ - rubygem-gon61>=6.1.0:www/rubygem-gon61 \ + rubygem-gon>=6.2.0:www/rubygem-gon \ 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 \ @@ -176,7 +177,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \ rubygem-prometheus-client-mmap>=0.9.3:devel/rubygem-prometheus-client-mmap \ - rubygem-octokit>=4.8:net/rubygem-octokit \ + 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 \ rubygem-html2text>=0:textproc/rubygem-html2text \ @@ -185,12 +186,11 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ - rubygem-net-ssh4>=4.2.0:security/rubygem-net-ssh4 \ + rubygem-net-ssh>=5.0:security/rubygem-net-ssh \ rubygem-sshkey>=1.9.0:security/rubygem-sshkey \ - rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \ - rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \ + rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto099>=0.99.0:net/rubygem-gitaly-proto099 \ + rubygem-gitaly-proto>=0.101.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.11.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf351>=3.5.1:devel/rubygem-google-protobuf351 \ @@ -200,7 +200,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \ rubygem-lograge>=0.5:www/rubygem-lograge \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging \ - rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 + rubygem-asset_sync>=2.4:net/rubygem-asset_sync PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \ rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg @@ -210,9 +210,10 @@ MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rub USE_RUBY= yes USE_RC_SUBR= gitlab -USE_GITHUB= yes -GH_ACCOUNT= gitlabhq -GH_PROJECT= gitlabhq +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org +# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags +GL_COMMIT= d9540ee0464796746ec0906c0c2762ca099be3e5 USERS= git GROUPS= git Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab/distinfo Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/distinfo Wed Jul 4 17:38:29 2018 (r473910) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529946907 -SHA256 (gitlabhq-gitlabhq-v10.8.5_GH0.tar.gz) = 3ed384557531485ae79f6549c6e8738ee8b0ee859f729b617bf4a58b3cec0006 -SIZE (gitlabhq-gitlabhq-v10.8.5_GH0.tar.gz) = 48454668 +TIMESTAMP = 1530451249 +SHA256 (gitlab-org-gitlab-ce-d9540ee0464796746ec0906c0c2762ca099be3e5_GL0.tar.gz) = 7b28ed31240324079d8a0fcdc8f5bd2b654dad4206c1d67f741e5dfa32ce447e +SIZE (gitlab-org-gitlab-ce-d9540ee0464796746ec0906c0c2762ca099be3e5_GL0.tar.gz) = 49735059 Modified: head/www/gitlab-ce/files/gitlab.in ============================================================================== --- head/www/gitlab/files/gitlab.in Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/gitlab.in Wed Jul 4 17:38:29 2018 (r473910) @@ -51,7 +51,7 @@ RAILS_ENV="production" # Script variable names should be lower-case not to conflict with # internal /bin/sh variables such as PATH, EDITOR or SHELL. app_user="git" -app_root="/usr/local/www/gitlab" +app_root="/usr/local/www/gitlab-ce" pid_path="$app_root/tmp/pids" socket_path="$app_root/tmp/sockets" rails_socket="$socket_path/gitlab.socket" Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/patch-Gemfile Wed Jul 4 17:38:29 2018 (r473910) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2018-06-20 17:48:20 UTC +--- Gemfile.orig 2018-06-21 15:14:17 UTC +++ Gemfile @@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', gem_versions['default_value_for'] @@ -9,7 +9,7 @@ gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -@@ -118,7 +118,7 @@ gem 'fog-rackspace', '~> 0.1.1' +@@ -123,7 +123,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage @@ -18,7 +18,7 @@ # for aws storage gem 'unf', '~> 0.1.4' -@@ -169,7 +169,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req +@@ -177,7 +177,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -27,7 +27,7 @@ # Colored output to console gem 'rainbow', '~> 2.2' -@@ -284,7 +284,7 @@ gem 'batch-loader', '~> 1.2.1' +@@ -291,7 +291,7 @@ gem 'batch-loader', '~> 1.2.1' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -36,7 +36,7 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -@@ -292,99 +292,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -299,96 +299,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do @@ -69,15 +69,13 @@ - gem 'pry-byebug', '~> 3.4.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - -- gem 'awesome_print', '~> 1.2.0', require: false +- gem 'awesome_print', require: false - gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.5.0' - gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.6.0' - gem 'rspec-retry', '~> 0.4.5' -- gem 'spinach-rails', '~> 0.2.1' -- gem 'spinach-rerun-reporter', '~> 0.0.2' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false @@ -90,11 +88,10 @@ - - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' -- gem 'selenium-webdriver', '~> 3.5' +- gem 'selenium-webdriver', '~> 3.12' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' -- gem 'spring-commands-spinach', '~> 1.1.0' - - gem 'gitlab-styles', '~> 2.3', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines @@ -123,7 +120,7 @@ - -group :test do - gem 'shoulda-matchers', '~> 3.1.2', require: false -- gem 'email_spec', '~> 1.6.0' +- gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' - gem 'rails-controller-testing' if rails5? # Rails5 only gem. @@ -133,6 +130,15 @@ - gem 'test-prof', '~> 0.2.5' -end - - gem 'octokit', '~> 4.8' + gem 'octokit', '~> 4.9' gem 'mail_room', '~> 0.9.1' +@@ -419,7 +334,7 @@ group :ed25519 do + end + + # Gitaly GRPC client +-gem 'gitaly-proto', '~> 0.100.0', require: 'gitaly' ++gem 'gitaly-proto', '~> 0.101.0', require: 'gitaly' + gem 'grpc', '~> 1.11.0' + + # Locked until https://github.com/google/protobuf/issues/4210 is closed Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab/files/patch-config_gitlab.yml.example Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example Wed Jul 4 17:38:29 2018 (r473910) @@ -1,15 +1,15 @@ ---- config/gitlab.yml.example.orig 2018-06-06 20:30:27 UTC +--- config/gitlab.yml.example.orig 2018-06-21 15:14:17 UTC +++ config/gitlab.yml.example -@@ -213,7 +213,7 @@ production: &base +@@ -218,7 +218,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: - address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) -+ address: unix:/usr/local/www/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) ++ address: unix:/usr/local/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) ## Mattermost ## For enabling Add to Mattermost button -@@ -572,7 +572,7 @@ production: &base +@@ -577,7 +577,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -18,18 +18,18 @@ # Default Gitaly authentication token. Can be overriden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -590,8 +590,8 @@ production: &base +@@ -595,8 +595,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) + path: /usr/home/git/repositories/ -+ gitaly_address: unix:/usr/local/www/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) ++ gitaly_address: unix:/usr/local/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 -@@ -619,12 +619,12 @@ production: &base +@@ -624,12 +624,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -645,7 +645,7 @@ production: &base +@@ -650,7 +650,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_unicorn.rb.example ============================================================================== --- head/www/gitlab/files/patch-config_unicorn.rb.example Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/patch-config_unicorn.rb.example Wed Jul 4 17:38:29 2018 (r473910) @@ -5,13 +5,13 @@ # Help ensure your application will always spawn in the symlinked # "current" directory that Capistrano sets up. -working_directory "/home/git/gitlab" # available in 0.94.0+ -+working_directory "/usr/local/www/gitlab" # available in 0.94.0+ ++working_directory "/usr/local/www/gitlab-ce" # available in 0.94.0+ # Listen on both a Unix domain socket and a TCP port. # If you are load-balancing multiple Unicorn masters, lower the backlog # setting to e.g. 64 for faster failover. -listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024 -+listen "/usr/local/www/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024 ++listen "/usr/local/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024 listen "127.0.0.1:8080", :tcp_nopush => true # nuke workers after 30 seconds instead of 60 seconds (the default) @@ -20,15 +20,15 @@ # feel free to point this anywhere accessible on the filesystem -pid "/home/git/gitlab/tmp/pids/unicorn.pid" -+pid "/usr/local/www/gitlab/tmp/pids/unicorn.pid" ++pid "/usr/local/www/gitlab-ce/tmp/pids/unicorn.pid" # By default, the Unicorn logger will write to stderr. # Additionally, some applications/frameworks log to stderr or stdout, # so prevent them from going to /dev/null when daemonized here: -stderr_path "/home/git/gitlab/log/unicorn.stderr.log" -stdout_path "/home/git/gitlab/log/unicorn.stdout.log" -+stderr_path "/usr/local/www/gitlab/log/unicorn.stderr.log" -+stdout_path "/usr/local/www/gitlab/log/unicorn.stdout.log" ++stderr_path "/usr/local/www/gitlab-ce/log/unicorn.stderr.log" ++stdout_path "/usr/local/www/gitlab-ce/log/unicorn.stdout.log" # combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings # http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow Modified: head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab Wed Jul 4 17:38:29 2018 (r473910) @@ -5,7 +5,7 @@ # Gitlab socket file, # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket - server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; -+ server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; ++ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; } map $http_upgrade $connection_upgrade_gitlab { @@ -14,7 +14,7 @@ # Location to the Gitlab's public directory, # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public. - root /home/git/gitlab/public; -+ root /usr/local/www/gitlab/public; ++ root /usr/local/www/gitlab-ce/public; internal; } Modified: head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl ============================================================================== --- head/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl Wed Jul 4 17:38:29 2018 (r473910) @@ -5,7 +5,7 @@ # Gitlab socket file, # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket - server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; -+ server unix:/usr/local/www/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; ++ server unix:/usr/local/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0; } map $http_upgrade $connection_upgrade_gitlab_ssl { @@ -14,7 +14,7 @@ # Location to the Gitlab's public directory, # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public - root /home/git/gitlab/public; -+ root /usr/local/www/gitlab/public; ++ root /usr/local/www/gitlab-ce/public; internal; } } Modified: head/www/gitlab-ce/pkg-message ============================================================================== --- head/www/gitlab/pkg-message Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/pkg-message Wed Jul 4 17:38:29 2018 (r473910) @@ -7,9 +7,9 @@ follow the instructions in the guide at: https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.8-freebsd.md If you just installed an major upgrade of GitLab, for example you -switched from 10.7.x to 10.8.x, please follow the instructions in the guide at: +switched from 10.8.x to 11.0.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.7-10.8-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.8-11.0-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/pkg-plist Wed Jul 4 17:37:15 2018 (r473909) +++ head/www/gitlab-ce/pkg-plist Wed Jul 4 17:38:29 2018 (r473910) @@ -2,7 +2,7 @@ %%WWWDIR%%/.codeclimate.yml %%WWWDIR%%/.csscomb.json %%WWWDIR%%/.eslintignore -%%WWWDIR%%/.eslintrc +%%WWWDIR%%/.eslintrc.yml %%WWWDIR%%/.flayignore %%WWWDIR%%/.foreman %%WWWDIR%%/.github/ISSUE_TEMPLATE.md @@ -34,6 +34,7 @@ %%WWWDIR%%/Gemfile %%WWWDIR%%/Gemfile.rails5 %%WWWDIR%%/Gemfile.rails5.lock +%%WWWDIR%%/INSTALLATION_TYPE %%WWWDIR%%/LICENSE %%WWWDIR%%/MAINTENANCE.md %%WWWDIR%%/PROCESS.md @@ -60,26 +61,16 @@ %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_skipped.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_success.ico %%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_warning.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_canceled.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_created.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_failed.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_manual.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_not_found.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_pending.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_running.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_skipped.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_success.ico -%%WWWDIR%%/app/assets/images/ci_favicons/dev/favicon_status_warning.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_canceled.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_created.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_failed.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_manual.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_not_found.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_pending.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_running.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_skipped.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_success.ico -%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_warning.ico +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_canceled.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_created.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_failed.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_manual.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_not_found.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_pending.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_running.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_skipped.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_success.png +%%WWWDIR%%/app/assets/images/ci_favicons/favicon_status_warning.png %%WWWDIR%%/app/assets/images/dark-scheme-preview.png %%WWWDIR%%/app/assets/images/emoji.png %%WWWDIR%%/app/assets/images/emoji/100.png @@ -1880,8 +1871,9 @@ %%WWWDIR%%/app/assets/images/ext_snippet_icons/ext_snippet_icons.png %%WWWDIR%%/app/assets/images/ext_snippet_icons/logo.png %%WWWDIR%%/app/assets/images/favicon-blue.ico -%%WWWDIR%%/app/assets/images/favicon-yellow.ico -%%WWWDIR%%/app/assets/images/favicon.ico +%%WWWDIR%%/app/assets/images/favicon-blue.png +%%WWWDIR%%/app/assets/images/favicon-yellow.png +%%WWWDIR%%/app/assets/images/favicon.png %%WWWDIR%%/app/assets/images/file_icons.svg %%WWWDIR%%/app/assets/images/gitlab_logo.png %%WWWDIR%%/app/assets/images/gitorious-logo-black.png @@ -2001,7 +1993,6 @@ %%WWWDIR%%/app/assets/javascripts/boards/index.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 %%WWWDIR%%/app/assets/javascripts/boards/models/issue.js %%WWWDIR%%/app/assets/javascripts/boards/models/list.js %%WWWDIR%%/app/assets/javascripts/boards/models/milestone.js @@ -2198,19 +2189,30 @@ %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/success_message.vue %%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/unstage_button.vue %%WWWDIR%%/app/assets/javascripts/ide/components/editor_mode_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/external_link.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/index.vue %%WWWDIR%%/app/assets/javascripts/ide/components/file_finder/item.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide.vue -%%WWWDIR%%/app/assets/javascripts/ide/components/ide_file_buttons.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_review.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_side_bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_status_bar.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_tree.vue %%WWWDIR%%/app/assets/javascripts/ide/components/ide_tree_list.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/detail.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/detail/description.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/detail/scroll_button.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/item.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/list.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/jobs/stage.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/dropdown.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/item.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/merge_requests/list.vue %%WWWDIR%%/app/assets/javascripts/ide/components/mr_file_icon.vue %%WWWDIR%%/app/assets/javascripts/ide/components/new_dropdown/index.vue %%WWWDIR%%/app/assets/javascripts/ide/components/new_dropdown/modal.vue %%WWWDIR%%/app/assets/javascripts/ide/components/new_dropdown/upload.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/panes/right.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/pipelines/list.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_commit_section.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_editor.vue %%WWWDIR%%/app/assets/javascripts/ide/components/repo_file.vue @@ -2234,7 +2236,6 @@ %%WWWDIR%%/app/assets/javascripts/ide/lib/editor_options.js %%WWWDIR%%/app/assets/javascripts/ide/lib/keymap.json %%WWWDIR%%/app/assets/javascripts/ide/lib/themes/gl_theme.js -%%WWWDIR%%/app/assets/javascripts/ide/monaco_loader.js %%WWWDIR%%/app/assets/javascripts/ide/services/index.js %%WWWDIR%%/app/assets/javascripts/ide/stores/actions.js %%WWWDIR%%/app/assets/javascripts/ide/stores/actions/file.js @@ -2250,6 +2251,21 @@ %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/mutation_types.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/mutations.js %%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/actions.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/constants.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/index.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/mutations.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/merge_requests/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/constants.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/index.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/pipelines/utils.js %%WWWDIR%%/app/assets/javascripts/ide/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/ide/stores/mutations.js %%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/branch.js @@ -2331,11 +2347,13 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/http_status.js %%WWWDIR%%/app/assets/javascripts/lib/utils/image_utility.js %%WWWDIR%%/app/assets/javascripts/lib/utils/keycodes.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/logoutput_behaviours.js %%WWWDIR%%/app/assets/javascripts/lib/utils/notify.js %%WWWDIR%%/app/assets/javascripts/lib/utils/number_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/poll.js %%WWWDIR%%/app/assets/javascripts/lib/utils/pretty_time.js %%WWWDIR%%/app/assets/javascripts/lib/utils/regexp.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/scroll_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/simple_poll.js %%WWWDIR%%/app/assets/javascripts/lib/utils/sticky.js %%WWWDIR%%/app/assets/javascripts/lib/utils/text_markdown.js @@ -2425,6 +2443,7 @@ %%WWWDIR%%/app/assets/javascripts/notes/mixins/resolvable.js %%WWWDIR%%/app/assets/javascripts/notes/services/notes_service.js %%WWWDIR%%/app/assets/javascripts/notes/stores/actions.js +%%WWWDIR%%/app/assets/javascripts/notes/stores/collapse_utils.js %%WWWDIR%%/app/assets/javascripts/notes/stores/getters.js %%WWWDIR%%/app/assets/javascripts/notes/stores/index.js %%WWWDIR%%/app/assets/javascripts/notes/stores/mutation_types.js @@ -2520,6 +2539,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/ci/lints/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/destroy/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/gcp/login/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/gcp/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/show/index.js @@ -2618,6 +2638,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/snippets/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/tags/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/tree/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/components/delete_wiki_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/wikis/wikis.js %%WWWDIR%%/app/assets/javascripts/pages/search/init_filtered_search.js @@ -2647,7 +2668,6 @@ %%WWWDIR%%/app/assets/javascripts/performance_bar/services/performance_bar_service.js %%WWWDIR%%/app/assets/javascripts/performance_bar/stores/performance_bar_store.js %%WWWDIR%%/app/assets/javascripts/pipelines.js -%%WWWDIR%%/app/assets/javascripts/pipelines/components/async_button.vue %%WWWDIR%%/app/assets/javascripts/pipelines/components/blank_state.vue %%WWWDIR%%/app/assets/javascripts/pipelines/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/pipelines/components/graph/action_component.vue @@ -2689,6 +2709,18 @@ %%WWWDIR%%/app/assets/javascripts/project_select.js %%WWWDIR%%/app/assets/javascripts/project_select_combo_button.js %%WWWDIR%%/app/assets/javascripts/project_visibility.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_dropdown_mixin.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/constants.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/index.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/actions.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/getters.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/index.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/projects/gke_cluster_dropdowns/store/mutations.js +%%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/tree/components/commit_pipeline_status_component.vue @@ -2801,7 +2833,6 @@ %%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_header.vue -%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_merge_help.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue @@ -2820,7 +2851,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_not_allowed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue -%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.js +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue @@ -2830,7 +2861,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/dependencies.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/mr_widget_options.js +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/services/mr_widget_service.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -2846,6 +2877,9 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/viewers/markdown_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/deprecated_modal.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_hidden_input.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/dropdown/dropdown_search_input.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/expand_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js @@ -2878,7 +2912,6 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_create_label.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_footer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_header.vue -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_hidden_input.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_search_input.vue %%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 @@ -2887,6 +2920,8 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/skeleton_loading_container.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/table_pagination.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/tabs/tab.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/tabs/tabs.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/time_ago_tooltip.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/toggle_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue @@ -2898,6 +2933,7 @@ %%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/timeago.js +%%WWWDIR%%/app/assets/javascripts/vue_shared/models/assignee.js %%WWWDIR%%/app/assets/javascripts/vue_shared/models/label.js %%WWWDIR%%/app/assets/javascripts/vue_shared/translate.js %%WWWDIR%%/app/assets/javascripts/vue_shared/vue_resource_interceptor.js @@ -2905,7 +2941,9 @@ %%WWWDIR%%/app/assets/javascripts/zen_mode.js %%WWWDIR%%/app/assets/stylesheets/application.scss %%WWWDIR%%/app/assets/stylesheets/behaviors.scss +%%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss %%WWWDIR%%/app/assets/stylesheets/emoji_sprites.scss +%%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 @@ -2963,8 +3001,6 @@ %%WWWDIR%%/app/assets/stylesheets/framework/timeline.scss %%WWWDIR%%/app/assets/stylesheets/framework/toggle.scss %%WWWDIR%%/app/assets/stylesheets/framework/tooltips.scss -%%WWWDIR%%/app/assets/stylesheets/framework/tw_bootstrap.scss -%%WWWDIR%%/app/assets/stylesheets/framework/tw_bootstrap_variables.scss %%WWWDIR%%/app/assets/stylesheets/framework/typography.scss %%WWWDIR%%/app/assets/stylesheets/framework/variables.scss %%WWWDIR%%/app/assets/stylesheets/framework/vue_transitions.scss @@ -3072,6 +3108,7 @@ %%WWWDIR%%/app/controllers/boards/issues_controller.rb %%WWWDIR%%/app/controllers/boards/lists_controller.rb %%WWWDIR%%/app/controllers/ci/lints_controller.rb +%%WWWDIR%%/app/controllers/concerns/accepts_pending_invitations.rb %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb %%WWWDIR%%/app/controllers/concerns/boards_responses.rb %%WWWDIR%%/app/controllers/concerns/checks_collaboration.rb @@ -3087,6 +3124,7 @@ %%WWWDIR%%/app/controllers/concerns/issuable_actions.rb %%WWWDIR%%/app/controllers/concerns/issuable_collections.rb %%WWWDIR%%/app/controllers/concerns/issues_action.rb +%%WWWDIR%%/app/controllers/concerns/issues_calendar.rb %%WWWDIR%%/app/controllers/concerns/lfs_request.rb %%WWWDIR%%/app/controllers/concerns/members_presentation.rb %%WWWDIR%%/app/controllers/concerns/membership_actions.rb @@ -3126,6 +3164,7 @@ %%WWWDIR%%/app/controllers/explore/projects_controller.rb %%WWWDIR%%/app/controllers/explore/snippets_controller.rb %%WWWDIR%%/app/controllers/google_api/authorizations_controller.rb +%%WWWDIR%%/app/controllers/graphql_controller.rb %%WWWDIR%%/app/controllers/groups/application_controller.rb %%WWWDIR%%/app/controllers/groups/avatars_controller.rb %%WWWDIR%%/app/controllers/groups/boards_controller.rb @@ -3136,6 +3175,7 @@ %%WWWDIR%%/app/controllers/groups/runners_controller.rb %%WWWDIR%%/app/controllers/groups/settings/badges_controller.rb %%WWWDIR%%/app/controllers/groups/settings/ci_cd_controller.rb +%%WWWDIR%%/app/controllers/groups/shared_projects_controller.rb %%WWWDIR%%/app/controllers/groups/uploads_controller.rb %%WWWDIR%%/app/controllers/groups/variables_controller.rb %%WWWDIR%%/app/controllers/groups_controller.rb @@ -3318,6 +3358,26 @@ %%WWWDIR%%/app/finders/union_finder.rb %%WWWDIR%%/app/finders/user_recent_events_finder.rb %%WWWDIR%%/app/finders/users_finder.rb +%%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/resolvers/base_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/full_path_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/merge_request_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/project_resolver.rb +%%WWWDIR%%/app/graphql/types/base_enum.rb +%%WWWDIR%%/app/graphql/types/base_field.rb +%%WWWDIR%%/app/graphql/types/base_input_object.rb +%%WWWDIR%%/app/graphql/types/base_interface.rb +%%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/merge_request_type.rb +%%WWWDIR%%/app/graphql/types/mutation_type.rb +%%WWWDIR%%/app/graphql/types/project_type.rb +%%WWWDIR%%/app/graphql/types/query_type.rb +%%WWWDIR%%/app/graphql/types/time_type.rb %%WWWDIR%%/app/helpers/accounts_helper.rb %%WWWDIR%%/app/helpers/active_sessions_helper.rb %%WWWDIR%%/app/helpers/appearances_helper.rb @@ -3335,6 +3395,7 @@ %%WWWDIR%%/app/helpers/broadcast_messages_helper.rb %%WWWDIR%%/app/helpers/builds_helper.rb %%WWWDIR%%/app/helpers/button_helper.rb +%%WWWDIR%%/app/helpers/calendar_helper.rb %%WWWDIR%%/app/helpers/ci_status_helper.rb %%WWWDIR%%/app/helpers/clusters_helper.rb %%WWWDIR%%/app/helpers/commits_helper.rb @@ -3354,6 +3415,7 @@ %%WWWDIR%%/app/helpers/events_helper.rb %%WWWDIR%%/app/helpers/explore_helper.rb %%WWWDIR%%/app/helpers/external_wiki_helper.rb +%%WWWDIR%%/app/helpers/favicon_helper.rb %%WWWDIR%%/app/helpers/form_helper.rb %%WWWDIR%%/app/helpers/git_helper.rb %%WWWDIR%%/app/helpers/gitlab_routing_helper.rb @@ -3505,6 +3567,7 @@ %%WWWDIR%%/app/models/ci/variable.rb %%WWWDIR%%/app/models/clusters/applications/helm.rb %%WWWDIR%%/app/models/clusters/applications/ingress.rb +%%WWWDIR%%/app/models/clusters/applications/jupyter.rb %%WWWDIR%%/app/models/clusters/applications/prometheus.rb %%WWWDIR%%/app/models/clusters/applications/runner.rb %%WWWDIR%%/app/models/clusters/cluster.rb @@ -3524,14 +3587,17 @@ %%WWWDIR%%/app/models/concerns/atomic_internal_id.rb %%WWWDIR%%/app/models/concerns/avatarable.rb %%WWWDIR%%/app/models/concerns/awardable.rb +%%WWWDIR%%/app/models/concerns/batch_destroy_dependent_associations.rb %%WWWDIR%%/app/models/concerns/blob_like.rb %%WWWDIR%%/app/models/concerns/blocks_json_serialization.rb %%WWWDIR%%/app/models/concerns/bulk_member_access_load.rb %%WWWDIR%%/app/models/concerns/cache_markdown_field.rb +%%WWWDIR%%/app/models/concerns/cacheable_attributes.rb %%WWWDIR%%/app/models/concerns/case_sensitivity.rb %%WWWDIR%%/app/models/concerns/chronic_duration_attribute.rb %%WWWDIR%%/app/models/concerns/created_at_filterable.rb %%WWWDIR%%/app/models/concerns/deployment_platform.rb +%%WWWDIR%%/app/models/concerns/diff_file.rb %%WWWDIR%%/app/models/concerns/discussion_on_diff.rb %%WWWDIR%%/app/models/concerns/each_batch.rb %%WWWDIR%%/app/models/concerns/editable.rb @@ -3544,6 +3610,7 @@ %%WWWDIR%%/app/models/concerns/has_status.rb %%WWWDIR%%/app/models/concerns/has_variable.rb %%WWWDIR%%/app/models/concerns/ignorable_column.rb +%%WWWDIR%%/app/models/concerns/iid_routes.rb %%WWWDIR%%/app/models/concerns/importable.rb %%WWWDIR%%/app/models/concerns/issuable.rb %%WWWDIR%%/app/models/concerns/loaded_in_group_list.rb @@ -3586,6 +3653,7 @@ %%WWWDIR%%/app/models/concerns/uniquify.rb %%WWWDIR%%/app/models/concerns/updated_at_filterable.rb %%WWWDIR%%/app/models/concerns/valid_attribute.rb +%%WWWDIR%%/app/models/concerns/with_uploads.rb %%WWWDIR%%/app/models/container_repository.rb %%WWWDIR%%/app/models/conversational_development_index/card.rb %%WWWDIR%%/app/models/conversational_development_index/idea_to_production_step.rb @@ -3672,6 +3740,7 @@ %%WWWDIR%%/app/models/network/commit.rb %%WWWDIR%%/app/models/network/graph.rb %%WWWDIR%%/app/models/note.rb +%%WWWDIR%%/app/models/note_diff_file.rb %%WWWDIR%%/app/models/notification_reason.rb %%WWWDIR%%/app/models/notification_recipient.rb %%WWWDIR%%/app/models/notification_setting.rb @@ -3956,7 +4025,6 @@ %%WWWDIR%%/app/services/boards/lists/move_service.rb %%WWWDIR%%/app/services/chat_names/authorize_user_service.rb %%WWWDIR%%/app/services/chat_names/find_user_service.rb -%%WWWDIR%%/app/services/check_gcp_project_billing_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_schedule_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_service.rb %%WWWDIR%%/app/services/ci/ensure_stage_service.rb @@ -4043,6 +4111,7 @@ %%WWWDIR%%/app/services/issues/update_service.rb %%WWWDIR%%/app/services/keys/base_service.rb %%WWWDIR%%/app/services/keys/create_service.rb +%%WWWDIR%%/app/services/keys/destroy_service.rb %%WWWDIR%%/app/services/keys/last_used_service.rb %%WWWDIR%%/app/services/labels/base_service.rb %%WWWDIR%%/app/services/labels/create_service.rb @@ -4082,6 +4151,7 @@ %%WWWDIR%%/app/services/merge_requests/refresh_service.rb %%WWWDIR%%/app/services/merge_requests/reopen_service.rb %%WWWDIR%%/app/services/merge_requests/resolved_discussion_notification_service.rb +%%WWWDIR%%/app/services/merge_requests/squash_service.rb %%WWWDIR%%/app/services/merge_requests/update_service.rb %%WWWDIR%%/app/services/merge_requests/working_copy_base_service.rb %%WWWDIR%%/app/services/metrics_service.rb @@ -4103,7 +4173,6 @@ %%WWWDIR%%/app/services/notes/update_service.rb %%WWWDIR%%/app/services/notification_recipient_service.rb %%WWWDIR%%/app/services/notification_service.rb -%%WWWDIR%%/app/services/pages_service.rb %%WWWDIR%%/app/services/preview_markdown_service.rb %%WWWDIR%%/app/services/projects/after_import_service.rb %%WWWDIR%%/app/services/projects/autocomplete_service.rb @@ -4128,6 +4197,11 @@ %%WWWDIR%%/app/services/projects/housekeeping_service.rb %%WWWDIR%%/app/services/projects/import_export/export_service.rb %%WWWDIR%%/app/services/projects/import_service.rb +%%WWWDIR%%/app/services/projects/lfs_pointers/lfs_download_link_list_service.rb +%%WWWDIR%%/app/services/projects/lfs_pointers/lfs_download_service.rb +%%WWWDIR%%/app/services/projects/lfs_pointers/lfs_import_service.rb +%%WWWDIR%%/app/services/projects/lfs_pointers/lfs_link_service.rb +%%WWWDIR%%/app/services/projects/lfs_pointers/lfs_list_service.rb %%WWWDIR%%/app/services/projects/move_access_service.rb %%WWWDIR%%/app/services/projects/move_deploy_keys_projects_service.rb %%WWWDIR%%/app/services/projects/move_forks_service.rb @@ -4204,6 +4278,7 @@ %%WWWDIR%%/app/services/wiki_pages/update_service.rb %%WWWDIR%%/app/uploaders/attachment_uploader.rb %%WWWDIR%%/app/uploaders/avatar_uploader.rb +%%WWWDIR%%/app/uploaders/favicon_uploader.rb %%WWWDIR%%/app/uploaders/file_mover.rb %%WWWDIR%%/app/uploaders/file_uploader.rb %%WWWDIR%%/app/uploaders/gitlab_uploader.rb @@ -4217,7 +4292,6 @@ %%WWWDIR%%/app/uploaders/uploader_helper.rb %%WWWDIR%%/app/uploaders/workhorse.rb %%WWWDIR%%/app/validators/abstract_path_validator.rb -%%WWWDIR%%/app/validators/addressable_url_validator.rb %%WWWDIR%%/app/validators/certificate_fingerprint_validator.rb %%WWWDIR%%/app/validators/certificate_key_validator.rb %%WWWDIR%%/app/validators/certificate_validator.rb @@ -4227,14 +4301,13 @@ %%WWWDIR%%/app/validators/cron_validator.rb %%WWWDIR%%/app/validators/duration_validator.rb %%WWWDIR%%/app/validators/email_validator.rb -%%WWWDIR%%/app/validators/importable_url_validator.rb %%WWWDIR%%/app/validators/key_restriction_validator.rb %%WWWDIR%%/app/validators/line_code_validator.rb %%WWWDIR%%/app/validators/namespace_name_validator.rb %%WWWDIR%%/app/validators/namespace_path_validator.rb %%WWWDIR%%/app/validators/project_path_validator.rb +%%WWWDIR%%/app/validators/public_url_validator.rb %%WWWDIR%%/app/validators/top_level_group_validator.rb -%%WWWDIR%%/app/validators/url_placeholder_validator.rb %%WWWDIR%%/app/validators/url_validator.rb %%WWWDIR%%/app/validators/variable_duplicates_validator.rb %%WWWDIR%%/app/views/abuse_report_mailer/notify.html.haml @@ -4373,6 +4446,7 @@ %%WWWDIR%%/app/views/dashboard/groups/index.html.haml %%WWWDIR%%/app/views/dashboard/issues.atom.builder %%WWWDIR%%/app/views/dashboard/issues.html.haml +%%WWWDIR%%/app/views/dashboard/issues_calendar.ics.haml %%WWWDIR%%/app/views/dashboard/merge_requests.html.haml %%WWWDIR%%/app/views/dashboard/milestones/_milestone.html.haml %%WWWDIR%%/app/views/dashboard/milestones/index.html.haml @@ -4443,6 +4517,7 @@ %%WWWDIR%%/app/views/doorkeeper/authorized_applications/index.html.haml %%WWWDIR%%/app/views/email_rejection_mailer/rejection.html.haml %%WWWDIR%%/app/views/email_rejection_mailer/rejection.text.haml +%%WWWDIR%%/app/views/errors/_footer.html.haml %%WWWDIR%%/app/views/errors/access_denied.html.haml %%WWWDIR%%/app/views/errors/encoding.html.haml %%WWWDIR%%/app/views/errors/git_not_found.html.haml @@ -4486,6 +4561,7 @@ %%WWWDIR%%/app/views/groups/group_members/index.html.haml %%WWWDIR%%/app/views/groups/issues.atom.builder %%WWWDIR%%/app/views/groups/issues.html.haml +%%WWWDIR%%/app/views/groups/issues_calendar.ics.haml %%WWWDIR%%/app/views/groups/labels/destroy.js.haml %%WWWDIR%%/app/views/groups/labels/edit.html.haml %%WWWDIR%%/app/views/groups/labels/index.html.haml @@ -4504,6 +4580,9 @@ %%WWWDIR%%/app/views/groups/runners/_index.html.haml %%WWWDIR%%/app/views/groups/runners/_runner.html.haml %%WWWDIR%%/app/views/groups/runners/edit.html.haml +%%WWWDIR%%/app/views/groups/settings/_advanced.html.haml +%%WWWDIR%%/app/views/groups/settings/_general.html.haml +%%WWWDIR%%/app/views/groups/settings/_permissions.html.haml %%WWWDIR%%/app/views/groups/settings/badges/index.html.haml %%WWWDIR%%/app/views/groups/settings/ci_cd/show.html.haml %%WWWDIR%%/app/views/groups/show.atom.builder @@ -4535,6 +4614,7 @@ %%WWWDIR%%/app/views/import/google_code/status.html.haml %%WWWDIR%%/app/views/invites/show.html.haml %%WWWDIR%%/app/views/issues/_issue.atom.builder +%%WWWDIR%%/app/views/issues/_issues_calendar.ics.ruby %%WWWDIR%%/app/views/kaminari/gitlab/_first_page.html.haml %%WWWDIR%%/app/views/kaminari/gitlab/_gap.html.haml %%WWWDIR%%/app/views/kaminari/gitlab/_last_page.html.haml @@ -4626,6 +4706,8 @@ %%WWWDIR%%/app/views/notify/member_invited_email.text.erb %%WWWDIR%%/app/views/notify/merge_request_status_email.html.haml %%WWWDIR%%/app/views/notify/merge_request_status_email.text.haml +%%WWWDIR%%/app/views/notify/merge_request_unmergeable_email.html.haml +%%WWWDIR%%/app/views/notify/merge_request_unmergeable_email.text.haml %%WWWDIR%%/app/views/notify/merged_merge_request_email.html.haml %%WWWDIR%%/app/views/notify/merged_merge_request_email.text.haml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***