From owner-svn-ports-all@freebsd.org Sun Dec 23 12:49:28 2018 Return-Path: Delivered-To: svn-ports-all@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 2123D135A02B; Sun, 23 Dec 2018 12:49:28 +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 C7A0D723D7; Sun, 23 Dec 2018 12:49:27 +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 BDF55D429; Sun, 23 Dec 2018 12:49:27 +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 wBNCnR9E096333; Sun, 23 Dec 2018 12:49:27 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBNCnQee096325; Sun, 23 Dec 2018 12:49:26 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201812231249.wBNCnQee096325@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sun, 23 Dec 2018 12:49:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488215 - in head/www/gitlab-ce: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/gitlab-ce: . files X-SVN-Commit-Revision: 488215 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C7A0D723D7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] 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: Sun, 23 Dec 2018 12:49:28 -0000 Author: mfechner Date: Sun Dec 23 12:49:25 2018 New Revision: 488215 URL: https://svnweb.freebsd.org/changeset/ports/488215 Log: Upgrade to 11.6.0. https://about.gitlab.com/2018/12/22/gitlab-11-6-released/ Approved by: mentors (implicit) Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/distinfo 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/files/patch-config_unicorn.rb.example head/www/gitlab-ce/pkg-message head/www/gitlab-ce/pkg-plist Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/Makefile Sun Dec 23 12:49:25 2018 (r488215) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.5.5 +PORTVERSION= 11.6.0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -16,22 +16,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options MY_DEPENDS= git>=2.16.2:devel/git \ - gitlab-shell>=8.4.1:devel/gitlab-shell \ - gitlab-workhorse>=7.1.3:www/gitlab-workhorse \ - gitaly>=0.129.0:devel/gitaly \ + gitlab-shell>=8.4.3:devel/gitlab-shell \ + gitlab-workhorse>=7.6.0:www/gitlab-workhorse \ + gitaly>=1.7.1:devel/gitaly \ gitlab-pages>=1.3.1:www/gitlab-pages \ redis>=3.2.12:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ - rubygem-rails4>=4.2.10:www/rubygem-rails4 \ - rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ - rubygem-responders>=2.0:www/rubygem-responders \ + rubygem-rails50>=5.0.7.1:www/rubygem-rails50 \ + rubygem-rails-deprecated_sanitizer-rails50>=1.0.3:devel/rubygem-rails-deprecated_sanitizer-rails50 \ + rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \ + rubygem-responders-rails50>=2.0:www/rubygem-responders-rails50 \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ - rubygem-default_value_for30>=3.0.5:devel/rubygem-default_value_for30 \ + rubygem-gitlab-default_value_for>=3.1.1:devel/rubygem-gitlab-default_value_for \ rubygem-rugged>=0.27.0:devel/rubygem-rugged \ 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-devise-rails50>=4.4:devel/rubygem-devise-rails50 \ 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 \ @@ -53,13 +54,13 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ rubygem-akismet>=2.0:devel/rubygem-akismet \ - rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ + rubygem-devise-two-factor-rails50>=3.0.0:security/rubygem-devise-two-factor-rails50 \ 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 \ rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \ rubygem-browser>=2.5:www/rubygem-browser \ - rubygem-gpgme>=2.0.13:security/rubygem-gpgme \ + rubygem-gpgme>=2.0.18:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap20>=2.0.4:net/rubygem-gitlab_omniauth-ldap20 \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ rubygem-grape11>=1.1:devel/rubygem-grape11 \ @@ -68,7 +69,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ 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-kaminari-rails50>=1.0:www/rubygem-kaminari-rails50 \ rubygem-hamlit>=2.8.8:www/rubygem-hamlit \ rubygem-carrierwave>=1.2.3:www/rubygem-carrierwave \ rubygem-mini_magick>=0:graphics/rubygem-mini_magick \ @@ -93,7 +94,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \ - rubygem-asciidoctor>=1.5.6:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor>=1.5.8:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \ rubygem-rouge>=3.1:textproc/rubygem-rouge \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ @@ -102,6 +103,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-escape_utils>=1.1:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \ + rubygem-rack>=2.0.6:www/rubygem-rack \ rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \ rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \ rubygem-puma>=3.12:www/rubygem-puma \ @@ -111,6 +113,7 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-sidekiq>=5.2.1:devel/rubygem-sidekiq \ rubygem-sidekiq-cron0>=0.6.0:devel/rubygem-sidekiq-cron0 \ rubygem-redis-namespace>=1.6.0:databases/rubygem-redis-namespace \ + rubygem-gitlab-sidekiq-fetcher>0.1.0:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-rufus-scheduler342>=3.4.0:devel/rubygem-rufus-scheduler342 \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow>=3.0:devel/rubygem-rainbow \ @@ -120,17 +123,18 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ rubygem-js_regex>=2.2.1:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ + rubygem-redis-rails-rails50>=5.0.1:www/rubygem-redis-rails-rails50 \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ + rubygem-discordrb-webhooks-blackst0ne>=3.3.0:net-im/rubygem-discordrb-webhooks-blackst0ne \ rubygem-hipchat15>=1.5.0:net-im/rubygem-hipchat15 \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-flowdock>=0.7:www/rubygem-flowdock \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-hangouts-chat>=0.0.5:net/rubygem-hangouts-chat \ - rubygem-asana>=0.6.0:www/rubygem-asana \ + rubygem-asana>=0.8.1:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1:devel/rubygem-ruby-fogbugz021 \ - rubygem-kubeclient>=3.1.0:www/rubygem-kubeclient \ + rubygem-kubeclient>=4.0.0:www/rubygem-kubeclient \ rubygem-sanitize>=4.6:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.2:textproc/rubygem-loofah \ @@ -138,35 +142,35 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ + rubygem-mimemagic>=0.3.2:misc/rubygem-mimemagic \ 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>=0.9.10:www/rubygem-webpack-rails \ + rubygem-webpack-rails-rails50>=0.9.10:www/rubygem-webpack-rails-rails50 \ rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \ - rubygem-sass-rails-rails4>=5.0.6:textproc/rubygem-sass-rails-rails4 \ + rubygem-sass-rails-rails50>=5.0.6:textproc/rubygem-sass-rails-rails50 \ rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable>=2.5.2:www/rubygem-addressable \ - rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \ + rubygem-font-awesome-rails-rails50>=4.7:devel/rubygem-font-awesome-rails-rails50 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ - rubygem-gon>=6.2.0:www/rubygem-gon \ + rubygem-gon-rails50>=6.2.0:www/rubygem-gon-rails50 \ rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ rubygem-request_store>=1.3:devel/rubygem-request_store \ rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-base32>=0.3.0:converters/rubygem-base32 \ rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \ - rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \ + rubygem-premailer-rails19-rails50>=1.9.7:mail/rubygem-premailer-rails19-rails50 \ rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \ - rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \ + rubygem-rails-i18n-rails50>=4.0.9:devel/rubygem-rails-i18n-rails50 \ rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \ - rubygem-gettext_i18n_rails_js>=1.3:devel/rubygem-gettext_i18n_rails_js \ + rubygem-gettext_i18n_rails_js-rails50>=1.3:devel/rubygem-gettext_i18n_rails_js-rails50 \ rubygem-gettext>=3.2.2:devel/rubygem-gettext \ - rubygem-batch-loader>=1.2.1:devel/rubygem-batch-loader \ - rubygem-peek>=1.0.1:devel/rubygem-peek \ - rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \ - rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ - rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ - rubygem-gitlab-sidekiq-fetcher>0:devel/rubygem-gitlab-sidekiq-fetcher \ + rubygem-batch-loader>=1.2.2:devel/rubygem-batch-loader \ + rubygem-peek-rails50>=1.0.1:devel/rubygem-peek-rails50 \ + rubygem-peek-gc-rails50>=0.0.2:devel/rubygem-peek-gc-rails50 \ + rubygem-peek-rblineprof-rails50>=0.2.0:devel/rubygem-peek-rblineprof-rails50 \ + rubygem-peek-redis-rails50>=1.2.0:devel/rubygem-peek-redis-rails50 \ rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \ rubygem-octokit>=4.9:net/rubygem-octokit \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ @@ -175,14 +179,14 @@ MY_DEPENDS= git>=2.16.2:devel/git \ rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \ rubygem-rbtrace>=0.4:devel/rubygem-rbtrace \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ - rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \ + rubygem-health_check26-rails50>=2.6.0:devel/rubygem-health_check26-rails50 \ 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-sshkey>=1.9.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto>=0.123.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.3.0:net/rubygem-gitaly-proto \ rubygem-grpc>=1.15.0:net/rubygem-grpc \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-google-protobuf>=3.6:devel/rubygem-google-protobuf \ @@ -190,7 +194,7 @@ MY_DEPENDS= git>=2.16.2: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>=0.5:www/rubygem-lograge \ + rubygem-lograge-rails50>=0.5:www/rubygem-lograge-rails50 \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -205,9 +209,9 @@ PGSQL_DESC= Default PostgreSQL support (preferred) MYSQL_DESC= Optional MySQL support PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \ - rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg + rubygem-peek-pg-rails50>=1.3.0:databases/rubygem-peek-pg-rails50 MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \ - rubygem-peek-mysql2>=1.1.0:databases/rubygem-peek-mysql2 + rubygem-peek-mysql2-rails50>=1.1.0:databases/rubygem-peek-mysql2-rails50 USE_RUBY= yes @@ -215,7 +219,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 13c3b22c454950c2d9a65a1b5fcf8d29a4764fc2 +GL_COMMIT= 075f96092a74849cdfaacd6912fe66376599989d USERS= git GROUPS= git Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/distinfo Sun Dec 23 12:49:25 2018 (r488215) @@ -1,3 +1,3 @@ -TIMESTAMP = 1545463920 -SHA256 (gitlab-org-gitlab-ce-13c3b22c454950c2d9a65a1b5fcf8d29a4764fc2_GL0.tar.gz) = c57cf8916dc305a62dbc01aff79c8c7d13516d26d268b1b74d08e6e3684b53c6 -SIZE (gitlab-org-gitlab-ce-13c3b22c454950c2d9a65a1b5fcf8d29a4764fc2_GL0.tar.gz) = 50981733 +TIMESTAMP = 1545474491 +SHA256 (gitlab-org-gitlab-ce-075f96092a74849cdfaacd6912fe66376599989d_GL0.tar.gz) = 22eaf5a1bdb5b49fba147af64b3a80f3301af1e685f566ee763b8f8c1ea541cb +SIZE (gitlab-org-gitlab-ce-075f96092a74849cdfaacd6912fe66376599989d_GL0.tar.gz) = 49843497 Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/files/patch-Gemfile Sun Dec 23 12:49:25 2018 (r488215) @@ -1,16 +1,16 @@ ---- Gemfile.orig 2018-11-26 22:36:34 UTC +--- Gemfile.orig 2018-12-21 14:23:37 UTC +++ Gemfile -@@ -6,7 +6,7 @@ end +@@ -5,7 +5,7 @@ end + gem_versions = {} - gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' - gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' --gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' -+gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' - gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' - # --- The end of special code for migrating to Rails 5.0 --- + gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +-gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' ++gem_versions['rails'] = rails5? ? '5.0.7.1' : '4.2.11' + gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' -@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' - gem 'default_value_for', gem_versions['default_value_for'] + # The 2.0.6 version of rack requires monkeypatch to be present in +@@ -35,7 +35,7 @@ else + end # Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql @@ -18,16 +18,14 @@ gem 'pg', '~> 0.18.2', group: :postgres gem 'rugged', '~> 0.27' -@@ -80,7 +80,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', - gem 'net-ldap' +@@ -181,13 +181,13 @@ gem 'acts-as-taggable-on', '~> 5.0' + gem 'sidekiq', '~> 5.2.1' + gem 'sidekiq-cron', '~> 0.6.0' + gem 'redis-namespace', '~> 1.6.0' +-gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch' ++gem 'gitlab-sidekiq-fetcher', '~> 0.4.0', require: 'sidekiq-reliable-fetch' - # API --gem 'grape', '~> 1.1' -+gem 'grape', '~> 1.1.0' - gem 'grape-entity', '~> 0.7.1' - gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' - -@@ -173,7 +173,7 @@ gem 'redis-namespace', '~> 1.6.0' + # Cron Parser gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -36,7 +34,7 @@ # Colored output to console gem 'rainbow', '~> 3.0' -@@ -287,7 +287,7 @@ gem 'batch-loader', '~> 1.2.1' +@@ -307,101 +307,16 @@ gem 'batch-loader', '~> 1.2.2' # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' @@ -45,7 +43,6 @@ gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -@@ -295,96 +295,11 @@ gem 'gitlab-sidekiq-fetcher', require: ' # Metrics group :metrics do @@ -55,8 +52,8 @@ # Prometheus gem 'prometheus-client-mmap', '~> 0.9.4' gem 'raindrops', '~> 0.18' - end - +-end +- -group :development do - gem 'foreman', '~> 0.84.0' - gem 'brakeman', '~> 4.2', require: false @@ -65,8 +62,8 @@ - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - # Better errors handler -- gem 'better_errors', '~> 2.1.0' -- gem 'binding_of_caller', '~> 0.7.2' +- gem 'better_errors', '~> 2.5.0' +- gem 'binding_of_caller', '~> 0.8.0' - - # thin instead webrick - gem 'thin', '~> 1.7.0' @@ -93,7 +90,7 @@ - gem 'minitest', '~> 5.7.0' - - # Generate Fake data -- gem 'ffaker', '~> 2.4' +- gem 'ffaker', '~> 2.10' - - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' @@ -108,14 +105,14 @@ - gem 'rubocop-rspec', '~> 1.22.1' - - gem 'scss_lint', '~> 0.56.0', require: false -- gem 'haml_lint', '~> 0.26.0', require: false +- gem 'haml_lint', '~> 0.28.0', require: false - gem 'simplecov', '~> 0.14.0', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 5.4', require: false -- gem 'knapsack', '~> 1.16' +- gem 'knapsack', '~> 1.17' - - gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] - @@ -134,11 +131,9 @@ - gem 'rails-controller-testing' if rails5? # Rails5 only gem. - gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0. - gem 'sham_rack', '~> 1.3.6' -- gem 'concurrent-ruby', '~> 1.0.5' +- gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.2.5' - gem 'rspec_junit_formatter' --end -- - gem 'octokit', '~> 4.9' + end - gem 'mail_room', '~> 0.9.1' + gem 'octokit', '~> 4.9' Modified: head/www/gitlab-ce/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab-ce/files/patch-config_gitlab.yml.example Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example Sun Dec 23 12:49:25 2018 (r488215) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2018-11-21 10:39:57 UTC +--- config/gitlab.yml.example.orig 2018-12-21 14:23:37 UTC +++ config/gitlab.yml.example -@@ -228,7 +228,7 @@ production: &base +@@ -231,7 +231,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 -@@ -590,7 +590,7 @@ production: &base +@@ -593,7 +593,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. -@@ -608,8 +608,8 @@ production: &base +@@ -611,8 +611,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 -@@ -637,12 +637,12 @@ production: &base +@@ -640,12 +640,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -45,7 +45,7 @@ # Git over HTTP upload_pack: true -@@ -663,7 +663,7 @@ production: &base +@@ -666,7 +666,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 Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb Sun Dec 23 12:49:25 2018 (r488215) @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2018-08-22 22:40:32 UTC +--- config/initializers/1_settings.rb.orig 2018-12-21 14:23:37 UTC +++ config/initializers/1_settings.rb -@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix'] +@@ -126,12 +126,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' Modified: head/www/gitlab-ce/files/patch-config_unicorn.rb.example ============================================================================== --- head/www/gitlab-ce/files/patch-config_unicorn.rb.example Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/files/patch-config_unicorn.rb.example Sun Dec 23 12:49:25 2018 (r488215) @@ -1,4 +1,4 @@ ---- config/unicorn.rb.example.orig 2018-11-21 10:39:57 UTC +--- config/unicorn.rb.example.orig 2018-12-21 14:23:37 UTC +++ config/unicorn.rb.example @@ -33,12 +33,12 @@ worker_processes 3 @@ -15,7 +15,7 @@ listen "127.0.0.1:8080", :tcp_nopush => true # nuke workers after 30 seconds instead of 60 seconds (the default) -@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => +@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => true timeout 60 # feel free to point this anywhere accessible on the filesystem Modified: head/www/gitlab-ce/pkg-message ============================================================================== --- head/www/gitlab-ce/pkg-message Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/pkg-message Sun Dec 23 12:49:25 2018 (r488215) @@ -4,12 +4,12 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.5-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/11.6-freebsd.md If you just installed an major upgrade of GitLab, for example you -switched from 11.4.x to 11.5.x, please follow the instructions in the guide at: +switched from 11.5.x to 11.6.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.4-11.5-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.5-11.6-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 Sun Dec 23 12:47:34 2018 (r488214) +++ head/www/gitlab-ce/pkg-plist Sun Dec 23 12:49:25 2018 (r488215) @@ -13,7 +13,6 @@ %%WWWDIR%%/.gitlab/issue_templates/Bug.md %%WWWDIR%%/.gitlab/issue_templates/Documentation.md %%WWWDIR%%/.gitlab/issue_templates/Feature proposal.md -%%WWWDIR%%/.gitlab/issue_templates/Research proposal.md %%WWWDIR%%/.gitlab/issue_templates/Security developer workflow.md %%WWWDIR%%/.gitlab/issue_templates/Test plan.md %%WWWDIR%%/.gitlab/merge_request_templates/Change documentation location.md @@ -39,11 +38,12 @@ %%WWWDIR%%/GITLAB_SHELL_VERSION %%WWWDIR%%/GITLAB_WORKHORSE_VERSION %%WWWDIR%%/Gemfile -%%WWWDIR%%/Gemfile.rails5 -%%WWWDIR%%/Gemfile.rails5.lock +%%WWWDIR%%/Gemfile.rails4 +%%WWWDIR%%/Gemfile.rails4.lock %%WWWDIR%%/INSTALLATION_TYPE %%WWWDIR%%/LICENSE %%WWWDIR%%/MAINTENANCE.md +%%WWWDIR%%/PHILOSOPHY.md %%WWWDIR%%/PROCESS.md %%WWWDIR%%/Procfile %%WWWDIR%%/README.md @@ -83,6 +83,7 @@ %%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/cluster_app_logos/cert_manager.png %%WWWDIR%%/app/assets/images/cluster_app_logos/elasticsearch.png %%WWWDIR%%/app/assets/images/cluster_app_logos/gitlab.png %%WWWDIR%%/app/assets/images/cluster_app_logos/helm.png @@ -2041,7 +2042,6 @@ %%WWWDIR%%/app/assets/javascripts/ci_variable_list/native_form_variable_list.js %%WWWDIR%%/app/assets/javascripts/close_reopen_report_toggle.js %%WWWDIR%%/app/assets/javascripts/clusters/clusters_bundle.js -%%WWWDIR%%/app/assets/javascripts/clusters/clusters_index.js %%WWWDIR%%/app/assets/javascripts/clusters/components/application_row.vue %%WWWDIR%%/app/assets/javascripts/clusters/components/applications.vue %%WWWDIR%%/app/assets/javascripts/clusters/constants.js @@ -2407,7 +2407,6 @@ %%WWWDIR%%/app/assets/javascripts/init_changes_dropdown.js %%WWWDIR%%/app/assets/javascripts/init_issuable_sidebar.js %%WWWDIR%%/app/assets/javascripts/init_labels.js -%%WWWDIR%%/app/assets/javascripts/init_legacy_filters.js %%WWWDIR%%/app/assets/javascripts/init_notes.js %%WWWDIR%%/app/assets/javascripts/integrations/integration_settings_form.js %%WWWDIR%%/app/assets/javascripts/issuable/auto_width_dropdown_select.js @@ -2416,6 +2415,10 @@ %%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_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/issue.js %%WWWDIR%%/app/assets/javascripts/issue_show/components/app.vue %%WWWDIR%%/app/assets/javascripts/issue_show/components/description.vue @@ -2466,6 +2469,7 @@ %%WWWDIR%%/app/assets/javascripts/lazy_loader.js %%WWWDIR%%/app/assets/javascripts/lib/ace.js %%WWWDIR%%/app/assets/javascripts/lib/ace/ace_config_paths.js.erb +%%WWWDIR%%/app/assets/javascripts/lib/graphql.js %%WWWDIR%%/app/assets/javascripts/lib/utils/accessor.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ace_utils.js %%WWWDIR%%/app/assets/javascripts/lib/utils/ajax_cache.js @@ -2477,6 +2481,7 @@ %%WWWDIR%%/app/assets/javascripts/lib/utils/csrf.js %%WWWDIR%%/app/assets/javascripts/lib/utils/datetime_utility.js %%WWWDIR%%/app/assets/javascripts/lib/utils/dom_utils.js +%%WWWDIR%%/app/assets/javascripts/lib/utils/file_upload.js %%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 @@ -2516,6 +2521,10 @@ %%WWWDIR%%/app/assets/javascripts/milestone.js %%WWWDIR%%/app/assets/javascripts/milestone_select.js %%WWWDIR%%/app/assets/javascripts/mini_pipeline_graph_dropdown.js +%%WWWDIR%%/app/assets/javascripts/mirrors/constants.js +%%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/dashboard.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph.vue @@ -2635,8 +2644,13 @@ %%WWWDIR%%/app/assets/javascripts/pages/explore/projects/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/activity/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/boards/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/destroy/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/index/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/show/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/clusters/update/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/group_members/index/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/issues/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/labels/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/labels/index/index.js @@ -2768,19 +2782,18 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/project_members/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/registry/repositories/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/releases/edit/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/serverless/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/services/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/create_deploy_token/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/form.js %%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/show/index.js -%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/repository/show/mirror_repos.js %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_feature_setting.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue %%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/project_avatar.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 @@ -2901,6 +2914,7 @@ %%WWWDIR%%/app/assets/javascripts/registry/stores/index.js %%WWWDIR%%/app/assets/javascripts/registry/stores/mutation_types.js %%WWWDIR%%/app/assets/javascripts/registry/stores/mutations.js +%%WWWDIR%%/app/assets/javascripts/registry/stores/state.js %%WWWDIR%%/app/assets/javascripts/reports/components/grouped_test_reports_app.vue %%WWWDIR%%/app/assets/javascripts/reports/components/issue_body.js %%WWWDIR%%/app/assets/javascripts/reports/components/issue_status_icon.vue @@ -2922,6 +2936,13 @@ %%WWWDIR%%/app/assets/javascripts/reports/store/utils.js %%WWWDIR%%/app/assets/javascripts/right_sidebar.js %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js +%%WWWDIR%%/app/assets/javascripts/serverless/components/empty_state.vue +%%WWWDIR%%/app/assets/javascripts/serverless/components/function_row.vue +%%WWWDIR%%/app/assets/javascripts/serverless/components/functions.vue +%%WWWDIR%%/app/assets/javascripts/serverless/event_hub.js +%%WWWDIR%%/app/assets/javascripts/serverless/serverless_bundle.js +%%WWWDIR%%/app/assets/javascripts/serverless/services/get_functions_service.js +%%WWWDIR%%/app/assets/javascripts/serverless/stores/serverless_store.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/emoji_menu_in_modal.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/event_hub.js %%WWWDIR%%/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue @@ -2985,15 +3006,19 @@ %%WWWDIR%%/app/assets/javascripts/ui_development_kit.js %%WWWDIR%%/app/assets/javascripts/usage_ping_consent.js %%WWWDIR%%/app/assets/javascripts/user_callout.js +%%WWWDIR%%/app/assets/javascripts/user_popovers.js %%WWWDIR%%/app/assets/javascripts/users_select.js %%WWWDIR%%/app/assets/javascripts/version_check_image.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/deployment.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/memory_usage.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_author_time.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_container.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_icon.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_pipeline_container.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue @@ -3052,6 +3077,8 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/swipe_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff/two_up_viewer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/mode_changed.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/diff_viewer/viewers/renamed.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 @@ -3066,11 +3093,16 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/help_popover.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/identicon.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_assignees.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_milestone.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/lib/utils/dom_utils.js %%WWWDIR%%/app/assets/javascripts/vue_shared/components/loading_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/field.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestion_diff_header.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/toolbar_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/memory_graph.vue @@ -3079,6 +3111,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue %%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/pagination_links.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/panel_resizer.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/pikaday.vue @@ -3110,6 +3143,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_image.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_link.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_avatar/user_avatar_svg.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue %%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 @@ -3126,6 +3160,8 @@ %%WWWDIR%%/app/assets/stylesheets/behaviors.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap.scss %%WWWDIR%%/app/assets/stylesheets/bootstrap_migration.scss +%%WWWDIR%%/app/assets/stylesheets/components/popover.scss +%%WWWDIR%%/app/assets/stylesheets/csslab.scss %%WWWDIR%%/app/assets/stylesheets/emoji_sprites.scss %%WWWDIR%%/app/assets/stylesheets/errors.scss %%WWWDIR%%/app/assets/stylesheets/framework.scss @@ -3150,6 +3186,7 @@ %%WWWDIR%%/app/assets/stylesheets/framework/files.scss %%WWWDIR%%/app/assets/stylesheets/framework/filters.scss %%WWWDIR%%/app/assets/stylesheets/framework/flash.scss +%%WWWDIR%%/app/assets/stylesheets/framework/flex_grid.scss %%WWWDIR%%/app/assets/stylesheets/framework/forms.scss %%WWWDIR%%/app/assets/stylesheets/framework/gfm.scss %%WWWDIR%%/app/assets/stylesheets/framework/gitlab_theme.scss @@ -3201,6 +3238,7 @@ %%WWWDIR%%/app/assets/stylesheets/highlight/white_base.scss %%WWWDIR%%/app/assets/stylesheets/mailers/highlighted_diff_email.scss %%WWWDIR%%/app/assets/stylesheets/notify.scss +%%WWWDIR%%/app/assets/stylesheets/page_bundles/_ide_mixins.scss %%WWWDIR%%/app/assets/stylesheets/page_bundles/ide.scss %%WWWDIR%%/app/assets/stylesheets/page_bundles/xterm.scss %%WWWDIR%%/app/assets/stylesheets/pages/admin.scss @@ -3364,6 +3402,8 @@ %%WWWDIR%%/app/controllers/groups/avatars_controller.rb %%WWWDIR%%/app/controllers/groups/boards_controller.rb %%WWWDIR%%/app/controllers/groups/children_controller.rb +%%WWWDIR%%/app/controllers/groups/clusters/applications_controller.rb +%%WWWDIR%%/app/controllers/groups/clusters_controller.rb %%WWWDIR%%/app/controllers/groups/group_members_controller.rb %%WWWDIR%%/app/controllers/groups/labels_controller.rb %%WWWDIR%%/app/controllers/groups/milestones_controller.rb @@ -3483,6 +3523,7 @@ %%WWWDIR%%/app/controllers/projects/repositories_controller.rb %%WWWDIR%%/app/controllers/projects/runner_projects_controller.rb %%WWWDIR%%/app/controllers/projects/runners_controller.rb +%%WWWDIR%%/app/controllers/projects/serverless/functions_controller.rb %%WWWDIR%%/app/controllers/projects/services_controller.rb %%WWWDIR%%/app/controllers/projects/settings/ci_cd_controller.rb %%WWWDIR%%/app/controllers/projects/settings/integrations_controller.rb @@ -3553,6 +3594,7 @@ %%WWWDIR%%/app/finders/personal_projects_finder.rb %%WWWDIR%%/app/finders/pipeline_schedules_finder.rb %%WWWDIR%%/app/finders/pipelines_finder.rb +%%WWWDIR%%/app/finders/projects/serverless/functions_finder.rb %%WWWDIR%%/app/finders/projects_finder.rb %%WWWDIR%%/app/finders/runner_jobs_finder.rb %%WWWDIR%%/app/finders/snippets_finder.rb @@ -3575,6 +3617,7 @@ %%WWWDIR%%/app/graphql/resolvers/base_resolver.rb %%WWWDIR%%/app/graphql/resolvers/concerns/resolves_pipelines.rb %%WWWDIR%%/app/graphql/resolvers/full_path_resolver.rb +%%WWWDIR%%/app/graphql/resolvers/issues_resolver.rb %%WWWDIR%%/app/graphql/resolvers/merge_request_pipelines_resolver.rb %%WWWDIR%%/app/graphql/resolvers/merge_request_resolver.rb %%WWWDIR%%/app/graphql/resolvers/project_pipelines_resolver.rb @@ -3588,15 +3631,22 @@ %%WWWDIR%%/app/graphql/types/base_union.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_status_enum.rb %%WWWDIR%%/app/graphql/types/ci/pipeline_type.rb +%%WWWDIR%%/app/graphql/types/issue_type.rb +%%WWWDIR%%/app/graphql/types/label_type.rb %%WWWDIR%%/app/graphql/types/merge_request_type.rb +%%WWWDIR%%/app/graphql/types/milestone_type.rb %%WWWDIR%%/app/graphql/types/mutation_type.rb +%%WWWDIR%%/app/graphql/types/order.rb %%WWWDIR%%/app/graphql/types/permission_types/base_permission_type.rb %%WWWDIR%%/app/graphql/types/permission_types/ci/pipeline.rb +%%WWWDIR%%/app/graphql/types/permission_types/issue.rb %%WWWDIR%%/app/graphql/types/permission_types/merge_request.rb %%WWWDIR%%/app/graphql/types/permission_types/project.rb %%WWWDIR%%/app/graphql/types/project_type.rb %%WWWDIR%%/app/graphql/types/query_type.rb +%%WWWDIR%%/app/graphql/types/sort.rb %%WWWDIR%%/app/graphql/types/time_type.rb +%%WWWDIR%%/app/graphql/types/user_type.rb %%WWWDIR%%/app/helpers/accounts_helper.rb %%WWWDIR%%/app/helpers/active_sessions_helper.rb %%WWWDIR%%/app/helpers/appearances_helper.rb @@ -3643,6 +3693,7 @@ %%WWWDIR%%/app/helpers/groups_helper.rb %%WWWDIR%%/app/helpers/hooks_helper.rb %%WWWDIR%%/app/helpers/icons_helper.rb +%%WWWDIR%%/app/helpers/ide_helper.rb %%WWWDIR%%/app/helpers/import_helper.rb %%WWWDIR%%/app/helpers/instance_configuration_helper.rb %%WWWDIR%%/app/helpers/issuables_helper.rb @@ -3676,7 +3727,6 @@ %%WWWDIR%%/app/helpers/safe_params_helper.rb %%WWWDIR%%/app/helpers/search_helper.rb %%WWWDIR%%/app/helpers/selects_helper.rb -%%WWWDIR%%/app/helpers/sentry_helper.rb %%WWWDIR%%/app/helpers/services_helper.rb %%WWWDIR%%/app/helpers/sidekiq_helper.rb %%WWWDIR%%/app/helpers/snippets_helper.rb @@ -3720,6 +3770,7 @@ %%WWWDIR%%/app/models/abuse_report.rb %%WWWDIR%%/app/models/active_session.rb %%WWWDIR%%/app/models/appearance.rb +%%WWWDIR%%/app/models/application_record.rb %%WWWDIR%%/app/models/application_setting.rb %%WWWDIR%%/app/models/application_setting/term.rb %%WWWDIR%%/app/models/audit_event.rb @@ -3787,6 +3838,7 @@ %%WWWDIR%%/app/models/ci/job_artifact.rb %%WWWDIR%%/app/models/ci/legacy_stage.rb %%WWWDIR%%/app/models/ci/pipeline.rb +%%WWWDIR%%/app/models/ci/pipeline_enums.rb %%WWWDIR%%/app/models/ci/pipeline_schedule.rb %%WWWDIR%%/app/models/ci/pipeline_schedule_variable.rb %%WWWDIR%%/app/models/ci/pipeline_variable.rb @@ -3797,6 +3849,7 @@ %%WWWDIR%%/app/models/ci/trigger.rb %%WWWDIR%%/app/models/ci/trigger_request.rb %%WWWDIR%%/app/models/ci/variable.rb +%%WWWDIR%%/app/models/clusters/applications/cert_manager.rb %%WWWDIR%%/app/models/clusters/applications/helm.rb %%WWWDIR%%/app/models/clusters/applications/ingress.rb %%WWWDIR%%/app/models/clusters/applications/jupyter.rb @@ -3817,6 +3870,7 @@ %%WWWDIR%%/app/models/commit_collection.rb %%WWWDIR%%/app/models/commit_range.rb %%WWWDIR%%/app/models/commit_status.rb +%%WWWDIR%%/app/models/commit_status_enums.rb %%WWWDIR%%/app/models/compare.rb %%WWWDIR%%/app/models/concerns/access_requestable.rb %%WWWDIR%%/app/models/concerns/artifact_migratable.rb @@ -3860,6 +3914,7 @@ %%WWWDIR%%/app/models/concerns/mentionable.rb %%WWWDIR%%/app/models/concerns/mentionable/reference_regexes.rb %%WWWDIR%%/app/models/concerns/milestoneish.rb +%%WWWDIR%%/app/models/concerns/mirror_authentication.rb %%WWWDIR%%/app/models/concerns/note_on_diff.rb %%WWWDIR%%/app/models/concerns/noteable.rb %%WWWDIR%%/app/models/concerns/optionally_search.rb @@ -3883,6 +3938,7 @@ %%WWWDIR%%/app/models/concerns/routable.rb %%WWWDIR%%/app/models/concerns/select_for_project_authorization.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/storage/legacy_namespace.rb @@ -3896,6 +3952,7 @@ %%WWWDIR%%/app/models/concerns/token_authenticatable.rb %%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/base.rb %%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/digest.rb +%%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/encrypted.rb %%WWWDIR%%/app/models/concerns/token_authenticatable_strategies/insecure.rb %%WWWDIR%%/app/models/concerns/triggerable_hooks.rb %%WWWDIR%%/app/models/concerns/uniquify.rb @@ -3959,6 +4016,7 @@ %%WWWDIR%%/app/models/hooks/web_hook.rb %%WWWDIR%%/app/models/hooks/web_hook_log.rb %%WWWDIR%%/app/models/identity.rb +%%WWWDIR%%/app/models/identity/uniqueness_scopes.rb %%WWWDIR%%/app/models/import_export_upload.rb %%WWWDIR%%/app/models/individual_note_discussion.rb %%WWWDIR%%/app/models/instance_configuration.rb @@ -4018,6 +4076,7 @@ %%WWWDIR%%/app/models/project_import_data.rb %%WWWDIR%%/app/models/project_import_state.rb %%WWWDIR%%/app/models/project_label.rb +%%WWWDIR%%/app/models/project_repository.rb %%WWWDIR%%/app/models/project_services/asana_service.rb %%WWWDIR%%/app/models/project_services/assembla_service.rb %%WWWDIR%%/app/models/project_services/bamboo_service.rb @@ -4036,6 +4095,7 @@ %%WWWDIR%%/app/models/project_services/ci_service.rb %%WWWDIR%%/app/models/project_services/custom_issue_tracker_service.rb %%WWWDIR%%/app/models/project_services/deployment_service.rb +%%WWWDIR%%/app/models/project_services/discord_service.rb %%WWWDIR%%/app/models/project_services/drone_ci_service.rb %%WWWDIR%%/app/models/project_services/emails_on_push_service.rb %%WWWDIR%%/app/models/project_services/external_wiki_service.rb @@ -4097,6 +4157,7 @@ %%WWWDIR%%/app/models/storage/hashed_project.rb %%WWWDIR%%/app/models/storage/legacy_project.rb %%WWWDIR%%/app/models/subscription.rb +%%WWWDIR%%/app/models/suggestion.rb %%WWWDIR%%/app/models/system_note_metadata.rb %%WWWDIR%%/app/models/term_agreement.rb %%WWWDIR%%/app/models/timelog.rb @@ -4105,9 +4166,13 @@ %%WWWDIR%%/app/models/trending_project.rb %%WWWDIR%%/app/models/u2f_registration.rb %%WWWDIR%%/app/models/upload.rb +%%WWWDIR%%/app/models/uploads/base.rb +%%WWWDIR%%/app/models/uploads/fog.rb +%%WWWDIR%%/app/models/uploads/local.rb %%WWWDIR%%/app/models/user.rb %%WWWDIR%%/app/models/user_agent_detail.rb %%WWWDIR%%/app/models/user_callout.rb +%%WWWDIR%%/app/models/user_callout_enums.rb %%WWWDIR%%/app/models/user_custom_attribute.rb %%WWWDIR%%/app/models/user_interacted_project.rb %%WWWDIR%%/app/models/user_preference.rb @@ -4139,6 +4204,7 @@ %%WWWDIR%%/app/policies/issuable_policy.rb %%WWWDIR%%/app/policies/issue_policy.rb %%WWWDIR%%/app/policies/merge_request_policy.rb +%%WWWDIR%%/app/policies/milestone_policy.rb %%WWWDIR%%/app/policies/namespace_policy.rb %%WWWDIR%%/app/policies/nil_policy.rb %%WWWDIR%%/app/policies/note_policy.rb @@ -4149,6 +4215,7 @@ %%WWWDIR%%/app/policies/project_policy/class_methods.rb %%WWWDIR%%/app/policies/project_snippet_policy.rb %%WWWDIR%%/app/policies/protected_branch_policy.rb +%%WWWDIR%%/app/policies/suggestion_policy.rb %%WWWDIR%%/app/policies/user_policy.rb %%WWWDIR%%/app/presenters/README.md %%WWWDIR%%/app/presenters/blob_presenter.rb @@ -4163,7 +4230,9 @@ %%WWWDIR%%/app/presenters/commit_status_presenter.rb %%WWWDIR%%/app/presenters/conversational_development_index/metric_presenter.rb %%WWWDIR%%/app/presenters/generic_commit_status_presenter.rb +%%WWWDIR%%/app/presenters/group_clusterable_presenter.rb %%WWWDIR%%/app/presenters/group_member_presenter.rb +%%WWWDIR%%/app/presenters/issue_presenter.rb %%WWWDIR%%/app/presenters/member_presenter.rb %%WWWDIR%%/app/presenters/members_presenter.rb %%WWWDIR%%/app/presenters/merge_request_presenter.rb @@ -4171,6 +4240,7 @@ %%WWWDIR%%/app/presenters/project_member_presenter.rb %%WWWDIR%%/app/presenters/project_presenter.rb %%WWWDIR%%/app/presenters/projects/settings/deploy_keys_presenter.rb +%%WWWDIR%%/app/presenters/user_presenter.rb %%WWWDIR%%/app/serializers/README.md %%WWWDIR%%/app/serializers/analytics_build_entity.rb %%WWWDIR%%/app/serializers/analytics_build_serializer.rb @@ -4214,6 +4284,7 @@ %%WWWDIR%%/app/serializers/deployment_entity.rb %%WWWDIR%%/app/serializers/deployment_serializer.rb %%WWWDIR%%/app/serializers/detailed_status_entity.rb +%%WWWDIR%%/app/serializers/diff_file_base_entity.rb %%WWWDIR%%/app/serializers/diff_file_entity.rb %%WWWDIR%%/app/serializers/diff_line_entity.rb %%WWWDIR%%/app/serializers/diff_line_parallel_entity.rb @@ -4221,6 +4292,7 @@ %%WWWDIR%%/app/serializers/diff_viewer_entity.rb %%WWWDIR%%/app/serializers/diffs_entity.rb %%WWWDIR%%/app/serializers/diffs_serializer.rb +%%WWWDIR%%/app/serializers/discussion_diff_file_entity.rb %%WWWDIR%%/app/serializers/discussion_entity.rb %%WWWDIR%%/app/serializers/discussion_serializer.rb %%WWWDIR%%/app/serializers/entity_date_helper.rb @@ -4237,6 +4309,7 @@ %%WWWDIR%%/app/serializers/group_variable_serializer.rb %%WWWDIR%%/app/serializers/issuable_entity.rb %%WWWDIR%%/app/serializers/issuable_sidebar_entity.rb +%%WWWDIR%%/app/serializers/issue_board_entity.rb %%WWWDIR%%/app/serializers/issue_entity.rb %%WWWDIR%%/app/serializers/issue_serializer.rb %%WWWDIR%%/app/serializers/issue_sidebar_entity.rb @@ -4269,11 +4342,15 @@ %%WWWDIR%%/app/serializers/project_note_entity.rb %%WWWDIR%%/app/serializers/project_note_serializer.rb %%WWWDIR%%/app/serializers/project_serializer.rb +%%WWWDIR%%/app/serializers/projects/serverless/service_entity.rb +%%WWWDIR%%/app/serializers/projects/serverless/service_serializer.rb +%%WWWDIR%%/app/serializers/remote_mirror_entity.rb %%WWWDIR%%/app/serializers/request_aware_entity.rb %%WWWDIR%%/app/serializers/runner_entity.rb %%WWWDIR%%/app/serializers/stage_entity.rb %%WWWDIR%%/app/serializers/stage_serializer.rb %%WWWDIR%%/app/serializers/submodule_entity.rb +%%WWWDIR%%/app/serializers/suggestion_entity.rb %%WWWDIR%%/app/serializers/test_case_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_entity.rb %%WWWDIR%%/app/serializers/test_reports_comparer_serializer.rb @@ -4318,9 +4395,11 @@ %%WWWDIR%%/app/services/boards/visits/latest_service.rb %%WWWDIR%%/app/services/chat_names/authorize_user_service.rb %%WWWDIR%%/app/services/chat_names/find_user_service.rb +%%WWWDIR%%/app/services/ci/archive_trace_service.rb %%WWWDIR%%/app/services/ci/compare_test_reports_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_schedule_service.rb %%WWWDIR%%/app/services/ci/create_pipeline_service.rb +%%WWWDIR%%/app/services/ci/destroy_pipeline_service.rb %%WWWDIR%%/app/services/ci/ensure_stage_service.rb %%WWWDIR%%/app/services/ci/extract_sections_from_build_trace_service.rb %%WWWDIR%%/app/services/ci/pipeline_trigger_service.rb @@ -4340,15 +4419,17 @@ %%WWWDIR%%/app/services/clusters/applications/create_service.rb %%WWWDIR%%/app/services/clusters/applications/install_service.rb %%WWWDIR%%/app/services/clusters/applications/schedule_installation_service.rb +%%WWWDIR%%/app/services/clusters/build_service.rb %%WWWDIR%%/app/services/clusters/create_service.rb %%WWWDIR%%/app/services/clusters/gcp/fetch_operation_service.rb %%WWWDIR%%/app/services/clusters/gcp/finalize_creation_service.rb %%WWWDIR%%/app/services/clusters/gcp/kubernetes.rb %%WWWDIR%%/app/services/clusters/gcp/kubernetes/create_or_update_namespace_service.rb -%%WWWDIR%%/app/services/clusters/gcp/kubernetes/create_service_account_service.rb +%%WWWDIR%%/app/services/clusters/gcp/kubernetes/create_or_update_service_account_service.rb %%WWWDIR%%/app/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service.rb %%WWWDIR%%/app/services/clusters/gcp/provision_service.rb %%WWWDIR%%/app/services/clusters/gcp/verify_provision_status_service.rb +%%WWWDIR%%/app/services/clusters/refresh_service.rb %%WWWDIR%%/app/services/clusters/update_service.rb %%WWWDIR%%/app/services/cohorts_service.rb %%WWWDIR%%/app/services/commits/change_service.rb @@ -4398,6 +4479,9 @@ %%WWWDIR%%/app/services/ham_service.rb %%WWWDIR%%/app/services/import_export_clean_up_service.rb %%WWWDIR%%/app/services/issuable/bulk_update_service.rb +%%WWWDIR%%/app/services/issuable/clone/attributes_rewriter.rb +%%WWWDIR%%/app/services/issuable/clone/base_service.rb +%%WWWDIR%%/app/services/issuable/clone/content_rewriter.rb %%WWWDIR%%/app/services/issuable/common_system_notes_service.rb %%WWWDIR%%/app/services/issuable/destroy_service.rb %%WWWDIR%%/app/services/issuable_base_service.rb @@ -4486,12 +4570,14 @@ %%WWWDIR%%/app/services/projects/batch_count_service.rb %%WWWDIR%%/app/services/projects/batch_forks_count_service.rb %%WWWDIR%%/app/services/projects/batch_open_issues_count_service.rb +%%WWWDIR%%/app/services/projects/cleanup_service.rb %%WWWDIR%%/app/services/projects/container_repository/destroy_service.rb %%WWWDIR%%/app/services/projects/count_service.rb %%WWWDIR%%/app/services/projects/create_from_template_service.rb %%WWWDIR%%/app/services/projects/create_service.rb %%WWWDIR%%/app/services/projects/destroy_service.rb %%WWWDIR%%/app/services/projects/detect_repository_languages_service.rb +%%WWWDIR%%/app/services/projects/disable_deploy_key_service.rb %%WWWDIR%%/app/services/projects/download_service.rb %%WWWDIR%%/app/services/projects/enable_deploy_key_service.rb %%WWWDIR%%/app/services/projects/fork_service.rb @@ -4558,6 +4644,8 @@ %%WWWDIR%%/app/services/spam_service.rb %%WWWDIR%%/app/services/submit_usage_ping_service.rb %%WWWDIR%%/app/services/submodules/update_service.rb +%%WWWDIR%%/app/services/suggestions/apply_service.rb +%%WWWDIR%%/app/services/suggestions/create_service.rb %%WWWDIR%%/app/services/system_hooks_service.rb %%WWWDIR%%/app/services/system_note_service.rb %%WWWDIR%%/app/services/tags/create_service.rb @@ -4758,6 +4846,7 @@ %%WWWDIR%%/app/views/ci/variables/_variable_row.html.haml %%WWWDIR%%/app/views/clusters/clusters/_advanced_settings.html.haml %%WWWDIR%%/app/views/clusters/clusters/_banner.html.haml +%%WWWDIR%%/app/views/clusters/clusters/_buttons.html.haml %%WWWDIR%%/app/views/clusters/clusters/_cluster.html.haml %%WWWDIR%%/app/views/clusters/clusters/_empty_state.html.haml %%WWWDIR%%/app/views/clusters/clusters/_gcp_signup_offer_banner.html.haml @@ -4941,6 +5030,7 @@ %%WWWDIR%%/app/views/help/shortcuts.js.haml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***