Date: Tue, 5 Jun 2018 19:32:50 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471809 - in branches/2018Q2: devel/gitaly devel/gitaly/files net/rubygem-grpc www/gitlab www/gitlab/files Message-ID: <201806051932.w55JWo0n064537@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Tue Jun 5 19:32:49 2018 New Revision: 471809 URL: https://svnweb.freebsd.org/changeset/ports/471809 Log: MFH: r469941 r471208 Update gitlab to 10.7.3. For list of changes look here: https://about.gitlab.com/2018/04/22/gitlab-10-7-released/ Please note that gitlab-pages is temporarily removed and will be added later if upstream bug is fixed. To not update to this version if you require gitlab-pages. The Gemfile.lock is now generated on gitlab startup, so this should help with Gemfile issues. Reviewed by: swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D15314 Applied security upgrade to gitlab 10.7.5. Fixed bug with wrong path for gitlab-workhouse that should fix artifacts (reported by Felix <mail@felix.flornet.de>). This was fix upstream but is not included in this version yet: https://gitlab.com/gitlab-org/gitlab-ce/issues/46763 Update net/rubygem-grpc to 1.11.1 which is required for gitlab 10.7.5. Sync dep net/rubygem-grpc with gitlab which uses now 1.11.1. Added gitlab-pages again to dependencies as the new version builds again. Reported by: Felix <mail@felix.flornet.de> Reviewed by: swills (mentor) Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D15631 Approved by: ports-secteam (eadler) Added: branches/2018Q2/www/gitlab/files/patch-app_uploaders_object__storage.rb - copied unchanged from r471208, head/www/gitlab/files/patch-app_uploaders_object__storage.rb Modified: branches/2018Q2/devel/gitaly/Makefile branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile branches/2018Q2/net/rubygem-grpc/Makefile branches/2018Q2/net/rubygem-grpc/distinfo branches/2018Q2/www/gitlab/Makefile branches/2018Q2/www/gitlab/distinfo branches/2018Q2/www/gitlab/files/gitlab.in branches/2018Q2/www/gitlab/files/patch-Gemfile branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example branches/2018Q2/www/gitlab/pkg-message branches/2018Q2/www/gitlab/pkg-plist Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/gitaly/Makefile ============================================================================== --- branches/2018Q2/devel/gitaly/Makefile Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/devel/gitaly/Makefile Tue Jun 5 19:32:49 2018 (r471809) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 0.91.0 -PORTREVISION= 1 +DISTVERSION= 0.96.1 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= idefix@fechner.net Modified: branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/devel/gitaly/files/patch-ruby_Gemfile Tue Jun 5 19:32:49 2018 (r471809) @@ -1,6 +1,12 @@ --- ruby/Gemfile.orig 2018-04-12 00:44:37 UTC +++ ruby/Gemfile -@@ -13,12 +13,8 @@ gem 'sentry-raven', '~> 2.7.2', require: +@@ -8,17 +8,13 @@ gem 'activesupport', '~> 5.0.2' + gem 'rdoc', '~> 4.2' + gem 'gollum-lib', '~> 4.2', require: false + gem 'gollum-rugged_adapter', '~> 0.4.4', require: false +-gem 'grpc', '~> 1.10.0' ++gem 'grpc', '~> 1.11.0' + gem 'sentry-raven', '~> 2.7.2', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE Modified: branches/2018Q2/net/rubygem-grpc/Makefile ============================================================================== --- branches/2018Q2/net/rubygem-grpc/Makefile Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/net/rubygem-grpc/Makefile Tue Jun 5 19:32:49 2018 (r471809) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= grpc -PORTVERSION= 1.10.0 +PORTVERSION= 1.11.1 CATEGORIES= net rubygems MASTER_SITES= RG Modified: branches/2018Q2/net/rubygem-grpc/distinfo ============================================================================== --- branches/2018Q2/net/rubygem-grpc/distinfo Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/net/rubygem-grpc/distinfo Tue Jun 5 19:32:49 2018 (r471809) @@ -1,3 +1,3 @@ -TIMESTAMP = 1523377112 -SHA256 (rubygem/grpc-1.10.0.gem) = 0235e5e5cff0253c53f022bbfa6929a4c4ef97db5900122981b7375a25c49b9f -SIZE (rubygem/grpc-1.10.0.gem) = 2769408 +TIMESTAMP = 1527758749 +SHA256 (rubygem/grpc-1.11.1.gem) = 890ee82183285ac228c13122ee8d0f17e29f055c102d75a5d7bf31364b25729c +SIZE (rubygem/grpc-1.11.1.gem) = 2883584 Modified: branches/2018Q2/www/gitlab/Makefile ============================================================================== --- branches/2018Q2/www/gitlab/Makefile Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/Makefile Tue Jun 5 19:32:49 2018 (r471809) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.6.5 +PORTVERSION= 10.7.5 DISTVERSIONPREFIX= v CATEGORIES= www devel @@ -25,10 +25,10 @@ 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>=6.0.4:devel/gitlab-shell \ - gitlab-workhorse>=4.0.0:www/gitlab-workhorse \ - gitaly>=0.91.0:devel/gitaly \ - gitlab-pages>=0.7.1:www/gitlab-pages \ + gitlab-shell>=7.1.2:devel/gitlab-shell \ + gitlab-workhorse>=4.1.0:www/gitlab-workhorse \ + gitaly>=0.96.1:devel/gitaly \ + gitlab-pages>=0.9.1:www/gitlab-pages \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ @@ -36,26 +36,26 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ rubygem-responders>=2.0:www/rubygem-responders \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ - rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \ - rubygem-rugged>=0.26.0:devel/rubygem-rugged \ + 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-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.2:devel/rubygem-devise \ - rubygem-doorkeeper42>=4.2:security/rubygem-doorkeeper42 \ - rubygem-doorkeeper-openid_connect12>=1.2.0:security/rubygem-doorkeeper-openid_connect12 \ - rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \ + rubygem-doorkeeper>=4.3:security/rubygem-doorkeeper \ + rubygem-doorkeeper-openid_connect>=1.3:security/rubygem-doorkeeper-openid_connect \ + rubygem-omniauth>=1.8:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \ rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \ - rubygem-omniauth-google-oauth2>=0.5.2:net/rubygem-omniauth-google-oauth2 \ + rubygem-omniauth-google-oauth2>=0.5.3:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \ - rubygem-omniauth-saml17>=1.7.0:security/rubygem-omniauth-saml17 \ + rubygem-omniauth-saml>=1.10:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \ - rubygem-omniauth-twitter12>=1.2.0:net/rubygem-omniauth-twitter12 \ + 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-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ @@ -64,7 +64,7 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ - rubygem-attr_encrypted30>=3.0.0:security/rubygem-attr_encrypted30 \ + 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.2:www/rubygem-browser \ @@ -82,17 +82,17 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \ rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ - rubygem-fog-aws1>=1.4:net/rubygem-fog-aws1 \ + rubygem-fog-aws>=2.0.1:net/rubygem-fog-aws \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ - rubygem-fog-google0>=0.5:net/rubygem-fog-google0 \ + rubygem-fog-google>=1.3.3:net/rubygem-fog-google \ rubygem-fog-local>=0.3:net/rubygem-fog-local \ rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.2.0:net/rubygem-fog-aliyun \ - rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \ + rubygem-google-api-client>=0.19.8:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7:databases/rubygem-seed-fu \ - rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \ + rubygem-html-pipeline>=2.7.1:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ @@ -102,8 +102,8 @@ RUN_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.2:textproc/rubygem-asciidoctor \ - rubygem-asciidoctor-plantuml007>=0.0.7:textproc/rubygem-asciidoctor-plantuml007 \ + rubygem-asciidoctor>=1.5.6:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor-plantuml>=0.0.8:textproc/rubygem-asciidoctor-plantuml \ rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ @@ -111,8 +111,8 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ 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.4.0:databases/rubygem-state_machines-activerecord \ - rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \ + 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-cron>=0.6.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace15>=1.5.2:databases/rubygem-redis-namespace15 \ @@ -133,12 +133,12 @@ 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-kubeclient22>=2.2.0:www/rubygem-kubeclient22 \ + rubygem-kubeclient>=3.0.0:www/rubygem-kubeclient \ rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah>=2.2:textproc/rubygem-loofah \ - rubygem-licensee8>=8.7:devel/rubygem-licensee8 \ + rubygem-licensee8>=8.9:devel/rubygem-licensee8 \ rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ @@ -157,53 +157,50 @@ RUN_DEPENDS= git>=2.16.2:devel/git \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ rubygem-gon61>=6.1.0:www/rubygem-gon61 \ rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ - rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \ 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.5.3:devel/rubygem-sentry-raven \ + rubygem-sentry-raven>=2.7:devel/rubygem-sentry-raven \ rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \ rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \ rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \ rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \ - rubygem-gettext_i18n_rails_js12>=1.2.0:devel/rubygem-gettext_i18n_rails_js12 \ + rubygem-gettext_i18n_rails_js>=1.3:devel/rubygem-gettext_i18n_rails_js \ 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-host>=1.0.0:devel/rubygem-peek-host \ rubygem-peek-performance_bar>=1.3.0:devel/rubygem-peek-performance_bar \ rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ 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.1:devel/rubygem-prometheus-client-mmap \ - rubygem-octokit46>=4.6.2:net/rubygem-octokit46 \ + rubygem-octokit>=4.8:net/rubygem-octokit \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ - rubygem-ruby-prof016>=0.16.2:devel/rubygem-ruby-prof016 \ + rubygem-ruby-prof>=0.17.0:devel/rubygem-ruby-prof \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ 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-ssh41>=4.1.0:security/rubygem-net-ssh41 \ + rubygem-net-ssh>=4.2.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-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly-proto088>=0.88.0:net/rubygem-gitaly-proto088 \ - rubygem-grpc>=1.10.0:net/rubygem-grpc \ + rubygem-gitaly-proto096>=0.96.0:net/rubygem-gitaly-proto096 \ + 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 \ rubygem-toml-rb10>=1.0.0:www/rubygem-toml-rb10 \ - rubygem-flipper011>=0.11.0:devel/rubygem-flipper011 \ - rubygem-flipper-active_record011>=0.11.0:databases/rubygem-flipper-active_record011 \ - rubygem-flipper-active_support_cache_store011>=0.11.0:devel/rubygem-flipper-active_support_cache_store011 \ + 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-grape_logging>=1.7:devel/rubygem-grape_logging \ - rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 \ - rubygem-rinku>=1.7.3:www/rubygem-rinku + rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 PGSQL_RUN_DEPENDS= rubygem-pg018>=0.18.2:databases/rubygem-pg018 \ rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg @@ -243,6 +240,7 @@ do-install: ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete + ${FIND} ${WRKSRC} -name "Gemfile.rail5.lock" -delete ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample Modified: branches/2018Q2/www/gitlab/distinfo ============================================================================== --- branches/2018Q2/www/gitlab/distinfo Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/distinfo Tue Jun 5 19:32:49 2018 (r471809) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525161156 -SHA256 (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 47fc8de80d7154150b11457b28920efdc93f4bc583017f6a13b4b6ba4fe8ee35 -SIZE (gitlabhq-gitlabhq-v10.6.5_GH0.tar.gz) = 46312621 +TIMESTAMP = 1527763488 +SHA256 (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 69829e44acec5622b98a957874bd0426779540866bfd5ac6637b2bb331101f30 +SIZE (gitlabhq-gitlabhq-v10.7.5_GH0.tar.gz) = 47807879 Modified: branches/2018Q2/www/gitlab/files/gitlab.in ============================================================================== --- branches/2018Q2/www/gitlab/files/gitlab.in Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/files/gitlab.in Tue Jun 5 19:32:49 2018 (r471809) @@ -88,6 +88,20 @@ test -f /etc/default/gitlab && . /etc/default/gitlab # Switch to the app_user if it is not he/she who is running the script. if [ "$USER" != "$app_user" ]; then + # Regenerate the Gemfile.lock for all related products + echo "Regenerate Gitlab Gemfile.lock" + rm -f "${app_root}"/Gemfile.lock + if ! su -l ${app_user} -c "cd ${app_root} && /usr/local/bin/bundle install --local --quiet"; then + echo "Could not create Gemfile.lock for gitlab, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" + exit 1 + fi + echo "Regenerate Gitaly Gemfile.lock" + rm -f "${gitaly_dir}"/ruby/Gemfile.lock + if ! su -l root -c "cd ${gitaly_dir}/ruby && /usr/local/bin/bundle install --local --quiet"; then + echo "Could not create Gemfile.lock for gitaly, please report this using FreeBSD Bugtracker, https://bugs.freebsd.org/" + exit 1 + fi + eval su - "$app_user" -c $(echo \")/usr/local/etc/rc.d/gitlab "$@"$(echo \"); exit; fi Modified: branches/2018Q2/www/gitlab/files/patch-Gemfile ============================================================================== --- branches/2018Q2/www/gitlab/files/patch-Gemfile Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/files/patch-Gemfile Tue Jun 5 19:32:49 2018 (r471809) @@ -1,33 +1,24 @@ ---- Gemfile.orig 2018-04-09 20:57:26 UTC +--- Gemfile.orig 2018-05-28 11:47:11 UTC +++ Gemfile -@@ -12,7 +12,7 @@ gem 'sprockets', '~> 3.7.0' - gem 'default_value_for', '~> 3.0.0' +@@ -24,7 +24,7 @@ gem 'sprockets', '~> 3.7.0' + gem 'default_value_for', gem_versions['default_value_for'] # Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql +gem 'mysql2', '>= 0.4.10', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres - gem 'rugged', '~> 0.26.0' -@@ -113,7 +113,7 @@ gem 'fog-rackspace', '~> 0.1.1' + gem 'rugged', '~> 0.27' +@@ -125,7 +125,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage --gem 'google-api-client', '~> 0.13.6' -+gem 'google-api-client', '>= 0.13.6' +-gem 'google-api-client', '~> 0.19.8' ++gem 'google-api-client', '>= 0.19.8' # for aws storage gem 'unf', '~> 0.1.4' -@@ -149,7 +149,7 @@ group :unicorn do - end - - # State machine --gem 'state_machines-activerecord', '~> 0.4.0' -+gem 'state_machines-activerecord', '>= 0.4.0' - - # Issue tags - gem 'acts-as-taggable-on', '~> 4.0' -@@ -164,7 +164,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req +@@ -176,7 +176,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -36,7 +27,7 @@ # Colored output to console gem 'rainbow', '~> 2.2' -@@ -214,7 +214,7 @@ gem 'kubeclient', '~> 2.2.0' +@@ -226,7 +226,7 @@ gem 'kubeclient', '~> 3.0' gem 'd3_rails', '~> 3.5.0' # Sanitize user input @@ -45,25 +36,16 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input -@@ -264,7 +264,7 @@ gem 'virtus', '~> 1.0.1' - gem 'base32', '~> 0.3.0' - - # Sentry integration --gem 'sentry-raven', '~> 2.5.3' -+gem 'sentry-raven', '>= 2.5.3' - - gem 'premailer-rails', '~> 1.9.7' - -@@ -281,7 +281,7 @@ gem 'batch-loader', '~> 1.2.1' +@@ -288,7 +288,7 @@ gem 'batch-loader', '~> 1.2.1' + # Perf bar gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' - gem 'peek-host', '~> 1.0.0' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '>= 1.1.0', group: :mysql gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' -@@ -290,97 +290,11 @@ gem 'peek-sidekiq', '~> 1.0.3' +@@ -297,98 +297,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do @@ -77,8 +59,8 @@ end -group :development do -- gem 'foreman', '~> 0.78.0' -- gem 'brakeman', '~> 3.6.0', require: false +- gem 'foreman', '~> 0.84.0' +- gem 'brakeman', '~> 4.2', require: false - - gem 'letter_opener_web', '~> 1.3.0' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false @@ -137,13 +119,15 @@ - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 3.1', require: false -- gem 'knapsack', '~> 1.11.0' +- gem 'knapsack', '~> 1.16' - -- gem 'activerecord_sane_schema_dumper', '0.2' +- gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] - - gem 'stackprof', '~> 0.2.10', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false +- +- gem 'timecop', '~> 0.8.0' -end - -group :test do @@ -151,20 +135,17 @@ - gem 'email_spec', '~> 1.6.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' -- gem 'test_after_commit', '~> 1.1' +- 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 'timecop', '~> 0.8.0' - gem 'concurrent-ruby', '~> 1.0.5' - gem 'test-prof', '~> 0.2.5' -end - - gem 'octokit', '~> 4.6.2' + gem 'octokit', '~> 4.8' gem 'mail_room', '~> 0.9.1' -@@ -431,3 +345,6 @@ gem 'grape_logging', '~> 1.7' +@@ -439,3 +352,4 @@ gem 'grape_logging', '~> 1.7' # Asset synchronization gem 'asset_sync', '~> 2.2.0' + -+# Make sure this is always present, as it is missing upstream but is required -+gem 'rinku' Copied: branches/2018Q2/www/gitlab/files/patch-app_uploaders_object__storage.rb (from r471208, head/www/gitlab/files/patch-app_uploaders_object__storage.rb) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/www/gitlab/files/patch-app_uploaders_object__storage.rb Tue Jun 5 19:32:49 2018 (r471809, copy of r471208, head/www/gitlab/files/patch-app_uploaders_object__storage.rb) @@ -0,0 +1,11 @@ +--- app/uploaders/object_storage.rb.orig 2018-05-31 10:45:20 UTC ++++ app/uploaders/object_storage.rb +@@ -11,7 +11,7 @@ module ObjectStorage + ObjectStorageUnavailable = Class.new(StandardError) + + DIRECT_UPLOAD_TIMEOUT = 4.hours +- TMP_UPLOAD_PATH = 'tmp/upload'.freeze ++ TMP_UPLOAD_PATH = 'tmp/uploads'.freeze + + module Store + LOCAL = 1 Modified: branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example ============================================================================== --- branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/files/patch-config_gitlab.yml.example Tue Jun 5 19:32:49 2018 (r471809) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2018-02-25 17:42:24 UTC +--- config/gitlab.yml.example.orig 2018-05-28 11:47:11 UTC +++ config/gitlab.yml.example -@@ -517,7 +517,7 @@ production: &base +@@ -570,7 +570,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +9,7 @@ # 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. -@@ -535,8 +535,8 @@ production: &base +@@ -588,8 +588,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +20,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -564,12 +564,12 @@ production: &base +@@ -617,12 +617,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -590,7 +590,7 @@ production: &base +@@ -643,7 +643,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: Modified: branches/2018Q2/www/gitlab/pkg-message ============================================================================== --- branches/2018Q2/www/gitlab/pkg-message Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/pkg-message Tue Jun 5 19:32:49 2018 (r471809) @@ -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/10.6-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/10.7-freebsd.md If you just installed an major upgrade of GitLab, for example you -switched from 10.4.x to 10.5.x, please follow the instructions in the guide at: +switched from 10.6.x to 10.7.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.5-10.6-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/10.6-10.7-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: Modified: branches/2018Q2/www/gitlab/pkg-plist ============================================================================== --- branches/2018Q2/www/gitlab/pkg-plist Tue Jun 5 19:27:06 2018 (r471808) +++ branches/2018Q2/www/gitlab/pkg-plist Tue Jun 5 19:32:49 2018 (r471809) @@ -18,6 +18,8 @@ %%WWWDIR%%/.mailmap %%WWWDIR%%/.nvmrc %%WWWDIR%%/.pkgr.yml +%%WWWDIR%%/.prettierignore +%%WWWDIR%%/.prettierrc %%WWWDIR%%/.rubocop.yml %%WWWDIR%%/.rubocop_todo.yml %%WWWDIR%%/.ruby-version @@ -29,6 +31,8 @@ %%WWWDIR%%/GITLAB_SHELL_VERSION %%WWWDIR%%/GITLAB_WORKHORSE_VERSION %%WWWDIR%%/Gemfile +%%WWWDIR%%/Gemfile.rails5 +%%WWWDIR%%/Gemfile.rails5.lock %%WWWDIR%%/LICENSE %%WWWDIR%%/MAINTENANCE.md %%WWWDIR%%/PROCESS.md @@ -45,6 +49,16 @@ %%WWWDIR%%/app/assets/images/auth_buttons/google_64.png %%WWWDIR%%/app/assets/images/auth_buttons/signin_with_google.png %%WWWDIR%%/app/assets/images/auth_buttons/twitter_64.png +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_canceled.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_created.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_failed.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_manual.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_not_found.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_pending.ico +%%WWWDIR%%/app/assets/images/ci_favicons/canary/favicon_status_running.ico +%%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 @@ -1863,6 +1877,7 @@ %%WWWDIR%%/app/assets/images/emoji/zzz.png %%WWWDIR%%/app/assets/images/emoji@2x.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/file_icons.svg %%WWWDIR%%/app/assets/images/gitlab_logo.png @@ -1871,63 +1886,6 @@ %%WWWDIR%%/app/assets/images/i2p-step.svg %%WWWDIR%%/app/assets/images/icon-merge-request-unmerged.svg %%WWWDIR%%/app/assets/images/icon_anchor.svg -%%WWWDIR%%/app/assets/images/icons.json -%%WWWDIR%%/app/assets/images/icons.svg -%%WWWDIR%%/app/assets/images/illustrations/cluster_popover.svg -%%WWWDIR%%/app/assets/images/illustrations/clusters_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/convdev_no_data.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/convdev_no_index.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/convdev_overview.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_1.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_10.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_2.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_3.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_4.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_5.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_6.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_7.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_8.svg -%%WWWDIR%%/app/assets/images/illustrations/convdev/i2p_step_9.svg -%%WWWDIR%%/app/assets/images/illustrations/epics.svg -%%WWWDIR%%/app/assets/images/illustrations/gitlab_logo.svg -%%WWWDIR%%/app/assets/images/illustrations/image_comment_light_cursor.svg -%%WWWDIR%%/app/assets/images/illustrations/image_comment_light_cursor@2x.svg -%%WWWDIR%%/app/assets/images/illustrations/issues.svg -%%WWWDIR%%/app/assets/images/illustrations/job_not_triggered.svg -%%WWWDIR%%/app/assets/images/illustrations/labels.svg -%%WWWDIR%%/app/assets/images/illustrations/logos/go_logo.svg -%%WWWDIR%%/app/assets/images/illustrations/logos/mattermost_logo.svg -%%WWWDIR%%/app/assets/images/illustrations/manual_action.svg -%%WWWDIR%%/app/assets/images/illustrations/merge_request_changes_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/merge_requests.svg -%%WWWDIR%%/app/assets/images/illustrations/monitoring/getting_started.svg -%%WWWDIR%%/app/assets/images/illustrations/monitoring/loading.svg -%%WWWDIR%%/app/assets/images/illustrations/monitoring/unable_to_connect.svg -%%WWWDIR%%/app/assets/images/illustrations/multi-editor_all_changes_committed_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/multi-editor_no_changes_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/multi-editor_no_staged_files_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/multi_file_editor_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/no_commits.svg -%%WWWDIR%%/app/assets/images/illustrations/pending_job_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/pipelines_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/pipelines_failed.svg -%%WWWDIR%%/app/assets/images/illustrations/pipelines_pending.svg -%%WWWDIR%%/app/assets/images/illustrations/priority_labels.svg -%%WWWDIR%%/app/assets/images/illustrations/service_desk_callout.svg -%%WWWDIR%%/app/assets/images/illustrations/service_desk_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/slack_logo.svg -%%WWWDIR%%/app/assets/images/illustrations/todos_all_done.svg -%%WWWDIR%%/app/assets/images/illustrations/todos_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/add_new_group.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/add_new_project.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/add_new_user.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/configure_server.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/ee_trial.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/globe.svg -%%WWWDIR%%/app/assets/images/illustrations/welcome/lightbulb.svg -%%WWWDIR%%/app/assets/images/illustrations/wiki-fro-logged-out-users.svg -%%WWWDIR%%/app/assets/images/illustrations/wiki_login_empty.svg -%%WWWDIR%%/app/assets/images/illustrations/wiki_logout_empty.svg %%WWWDIR%%/app/assets/images/koding-logo.svg %%WWWDIR%%/app/assets/images/logo.svg %%WWWDIR%%/app/assets/images/logo_wordmark.svg @@ -1964,13 +1922,28 @@ %%WWWDIR%%/app/assets/javascripts/api.js %%WWWDIR%%/app/assets/javascripts/autosave.js %%WWWDIR%%/app/assets/javascripts/awards_handler.js +%%WWWDIR%%/app/assets/javascripts/badges/components/badge.vue +%%WWWDIR%%/app/assets/javascripts/badges/components/badge_form.vue +%%WWWDIR%%/app/assets/javascripts/badges/components/badge_list.vue +%%WWWDIR%%/app/assets/javascripts/badges/components/badge_list_row.vue +%%WWWDIR%%/app/assets/javascripts/badges/components/badge_settings.vue +%%WWWDIR%%/app/assets/javascripts/badges/constants.js +%%WWWDIR%%/app/assets/javascripts/badges/empty_badge.js +%%WWWDIR%%/app/assets/javascripts/badges/store/actions.js +%%WWWDIR%%/app/assets/javascripts/badges/store/index.js +%%WWWDIR%%/app/assets/javascripts/badges/store/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/badges/store/mutations.js +%%WWWDIR%%/app/assets/javascripts/badges/store/state.js %%WWWDIR%%/app/assets/javascripts/behaviors/autosize.js %%WWWDIR%%/app/assets/javascripts/behaviors/bind_in_out.js -%%WWWDIR%%/app/assets/javascripts/behaviors/copy_as_gfm.js %%WWWDIR%%/app/assets/javascripts/behaviors/copy_to_clipboard.js %%WWWDIR%%/app/assets/javascripts/behaviors/details_behavior.js %%WWWDIR%%/app/assets/javascripts/behaviors/gl_emoji.js %%WWWDIR%%/app/assets/javascripts/behaviors/index.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/copy_as_gfm.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_gfm.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_math.js +%%WWWDIR%%/app/assets/javascripts/behaviors/markdown/render_mermaid.js %%WWWDIR%%/app/assets/javascripts/behaviors/quick_submit.js %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js %%WWWDIR%%/app/assets/javascripts/behaviors/secret_values.js @@ -2208,6 +2181,73 @@ %%WWWDIR%%/app/assets/javascripts/help/help.js %%WWWDIR%%/app/assets/javascripts/helpers/issuables_helper.js %%WWWDIR%%/app/assets/javascripts/how_to_merge.js +%%WWWDIR%%/app/assets/javascripts/ide/components/changed_file_icon.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/actions.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/list.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/commit_sidebar/radio_group.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/editor_mode_dropdown.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_context_bar.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_external_links.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_file_buttons.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_project_branches_tree.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_project_tree.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_repo_tree.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/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/repo_commit_section.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_editor.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_file.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_file_status_icon.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_loading_file.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_tab.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/repo_tabs.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/resizable_panel.vue +%%WWWDIR%%/app/assets/javascripts/ide/eventhub.js +%%WWWDIR%%/app/assets/javascripts/ide/ide_router.js +%%WWWDIR%%/app/assets/javascripts/ide/index.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/common/disposable.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/common/model.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/common/model_manager.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/decorations/controller.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/diff/controller.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/diff/diff.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/diff/diff_worker.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/editor.js +%%WWWDIR%%/app/assets/javascripts/ide/lib/editor_options.js +%%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 +%%WWWDIR%%/app/assets/javascripts/ide/stores/actions/merge_request.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/actions/project.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/actions/tree.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/index.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/actions.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/constants.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/getters.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/modules/commit/index.js +%%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/mutation_types.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/branch.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/file.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/merge_request.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/project.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/mutations/tree.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/state.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/utils.js +%%WWWDIR%%/app/assets/javascripts/ide/stores/workers/files_decorator_worker.js %%WWWDIR%%/app/assets/javascripts/image_diff/helpers/badge_helper.js %%WWWDIR%%/app/assets/javascripts/image_diff/helpers/comment_indicator_helper.js %%WWWDIR%%/app/assets/javascripts/image_diff/helpers/dom_helper.js @@ -2314,10 +2354,13 @@ %%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 +%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/axis.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/deployment.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/flag.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/legend.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/path.vue +%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/track_info.vue +%%WWWDIR%%/app/assets/javascripts/monitoring/components/graph/track_line.vue %%WWWDIR%%/app/assets/javascripts/monitoring/components/graph_group.vue %%WWWDIR%%/app/assets/javascripts/monitoring/event_hub.js %%WWWDIR%%/app/assets/javascripts/monitoring/mixins/monitoring_mixins.js @@ -2380,6 +2423,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/abuse_reports.js %%WWWDIR%%/app/assets/javascripts/pages/admin/abuse_reports/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/admin.js +%%WWWDIR%%/app/assets/javascripts/pages/admin/application_settings/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/broadcast_message.js %%WWWDIR%%/app/assets/javascripts/pages/admin/broadcast_messages/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/cohorts/index.js @@ -2399,9 +2443,6 @@ %%WWWDIR%%/app/assets/javascripts/pages/admin/projects/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue %%WWWDIR%%/app/assets/javascripts/pages/admin/users/index.js -%%WWWDIR%%/app/assets/javascripts/pages/ci/lints/ci_lint_editor.js -%%WWWDIR%%/app/assets/javascripts/pages/ci/lints/new/index.js -%%WWWDIR%%/app/assets/javascripts/pages/ci/lints/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/constants.js %%WWWDIR%%/app/assets/javascripts/pages/dashboard/activity/index.js %%WWWDIR%%/app/assets/javascripts/pages/dashboard/groups/index/index.js @@ -2427,6 +2468,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/groups/milestones/new/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/milestones/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/new/index.js +%%WWWDIR%%/app/assets/javascripts/pages/groups/settings/badges/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/groups/show/index.js %%WWWDIR%%/app/assets/javascripts/pages/help/index/index.js @@ -2458,6 +2500,9 @@ %%WWWDIR%%/app/assets/javascripts/pages/projects/boards/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/branches/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/branches/new/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/ci/lints/ci_lint_editor.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/ci/lints/new/index.js +%%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/index/index.js %%WWWDIR%%/app/assets/javascripts/pages/projects/clusters/show/index.js @@ -2535,7 +2580,10 @@ %%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/services/edit/index.js +%%WWWDIR%%/app/assets/javascripts/pages/projects/settings/badges/index/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/shared/permissions/components/project_feature_setting.vue %%WWWDIR%%/app/assets/javascripts/pages/projects/shared/permissions/components/project_setting_row.vue @@ -2561,6 +2609,7 @@ %%WWWDIR%%/app/assets/javascripts/pages/sessions/new/oauth_remember_me.js %%WWWDIR%%/app/assets/javascripts/pages/sessions/new/signin_tabs_memoizer.js %%WWWDIR%%/app/assets/javascripts/pages/sessions/new/username_validator.js +%%WWWDIR%%/app/assets/javascripts/pages/shared/mount_badge_settings.js %%WWWDIR%%/app/assets/javascripts/pages/snippets/edit/index.js %%WWWDIR%%/app/assets/javascripts/pages/snippets/form.js %%WWWDIR%%/app/assets/javascripts/pages/snippets/new/index.js @@ -2571,7 +2620,14 @@ %%WWWDIR%%/app/assets/javascripts/pdf/assets/img/bg.gif %%WWWDIR%%/app/assets/javascripts/pdf/index.vue %%WWWDIR%%/app/assets/javascripts/pdf/page/index.vue -%%WWWDIR%%/app/assets/javascripts/performance_bar.js +%%WWWDIR%%/app/assets/javascripts/performance_bar/components/detailed_metric.vue +%%WWWDIR%%/app/assets/javascripts/performance_bar/components/performance_bar_app.vue +%%WWWDIR%%/app/assets/javascripts/performance_bar/components/request_selector.vue +%%WWWDIR%%/app/assets/javascripts/performance_bar/components/simple_metric.vue +%%WWWDIR%%/app/assets/javascripts/performance_bar/components/upstream_performance_bar.vue +%%WWWDIR%%/app/assets/javascripts/performance_bar/index.js +%%WWWDIR%%/app/assets/javascripts/performance_bar/services/performance_bar_service.js +%%WWWDIR%%/app/assets/javascripts/performance_bar/stores/performance_bar_store.js %%WWWDIR%%/app/assets/javascripts/pipelines.js %%WWWDIR%%/app/assets/javascripts/pipelines/components/async_button.vue %%WWWDIR%%/app/assets/javascripts/pipelines/components/blank_state.vue @@ -2603,6 +2659,7 @@ %%WWWDIR%%/app/assets/javascripts/pipelines/stores/pipelines_store.js %%WWWDIR%%/app/assets/javascripts/preview_markdown.js %%WWWDIR%%/app/assets/javascripts/profile/account/components/delete_account_modal.vue +%%WWWDIR%%/app/assets/javascripts/profile/account/components/update_username.vue %%WWWDIR%%/app/assets/javascripts/profile/account/index.js %%WWWDIR%%/app/assets/javascripts/profile/gl_crop.js %%WWWDIR%%/app/assets/javascripts/profile/profile.js @@ -2652,9 +2709,6 @@ %%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/render_gfm.js -%%WWWDIR%%/app/assets/javascripts/render_math.js -%%WWWDIR%%/app/assets/javascripts/render_mermaid.js %%WWWDIR%%/app/assets/javascripts/right_sidebar.js %%WWWDIR%%/app/assets/javascripts/search_autocomplete.js %%WWWDIR%%/app/assets/javascripts/settings_panels.js @@ -2668,7 +2722,7 @@ %%WWWDIR%%/app/assets/javascripts/shortcuts_navigation.js %%WWWDIR%%/app/assets/javascripts/shortcuts_network.js %%WWWDIR%%/app/assets/javascripts/shortcuts_wiki.js -%%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/assignee_title.js +%%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/assignees.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/assignees/sidebar_assignees.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/confidential/confidential_issue_sidebar.vue @@ -2681,8 +2735,8 @@ %%WWWDIR%%/app/assets/javascripts/sidebar/components/participants/sidebar_participants.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue -%%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.js -%%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.js +%%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue +%%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/comparison_pane.vue %%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/estimate_only_pane.js %%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/help_state.js %%WWWDIR%%/app/assets/javascripts/sidebar/components/time_tracking/no_tracking_pane.js @@ -2723,16 +2777,17 @@ %%WWWDIR%%/app/assets/javascripts/users_select.js %%WWWDIR%%/app/assets/javascripts/version_check_image.js %%WWWDIR%%/app/assets/javascripts/visibility_select.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_deployment.js %%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_memory_usage.js %%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 %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/source_branch_removal_status.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue @@ -2744,15 +2799,15 @@ %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue %%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_nothing_to_merge.js %%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_pipeline_failed.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js %%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_sha_mismatch.js %%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_unresolved_discussions.js %%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_wip.js +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/nothing_to_merge.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue +%%WWWDIR%%/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue %%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 @@ -2765,6 +2820,12 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/ci_icon.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/clipboard_button.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/commit.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/content_viewer/viewers/download_viewer.vue +%%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/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 @@ -2779,8 +2840,7 @@ %%WWWDIR%%/app/assets/javascripts/vue_shared/components/markdown/header.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.js -%%WWWDIR%%/app/assets/javascripts/vue_shared/components/modal.vue +%%WWWDIR%%/app/assets/javascripts/vue_shared/components/memory_graph.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/navigation_tabs.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue %%WWWDIR%%/app/assets/javascripts/vue_shared/components/notes/placeholder_system_note.vue @@ -2920,7 +2980,6 @@ %%WWWDIR%%/app/assets/stylesheets/pages/issues.scss %%WWWDIR%%/app/assets/stylesheets/pages/issues/issue_count_badge.scss %%WWWDIR%%/app/assets/stylesheets/pages/labels.scss -%%WWWDIR%%/app/assets/stylesheets/pages/lint.scss %%WWWDIR%%/app/assets/stylesheets/pages/login.scss %%WWWDIR%%/app/assets/stylesheets/pages/members.scss %%WWWDIR%%/app/assets/stylesheets/pages/merge_conflicts.scss @@ -2929,6 +2988,7 @@ %%WWWDIR%%/app/assets/stylesheets/pages/note_form.scss %%WWWDIR%%/app/assets/stylesheets/pages/notes.scss %%WWWDIR%%/app/assets/stylesheets/pages/notifications.scss +%%WWWDIR%%/app/assets/stylesheets/pages/pages.scss %%WWWDIR%%/app/assets/stylesheets/pages/pipeline_schedules.scss %%WWWDIR%%/app/assets/stylesheets/pages/pipelines.scss %%WWWDIR%%/app/assets/stylesheets/pages/profile.scss @@ -2990,6 +3050,7 @@ %%WWWDIR%%/app/controllers/ci/lints_controller.rb %%WWWDIR%%/app/controllers/concerns/authenticates_with_two_factor.rb %%WWWDIR%%/app/controllers/concerns/boards_responses.rb +%%WWWDIR%%/app/controllers/concerns/checks_collaboration.rb %%WWWDIR%%/app/controllers/concerns/continue_params.rb %%WWWDIR%%/app/controllers/concerns/controller_with_cross_project_access_check.rb %%WWWDIR%%/app/controllers/concerns/creates_commit.rb @@ -3017,6 +3078,7 @@ %%WWWDIR%%/app/controllers/concerns/repository_settings_redirect.rb %%WWWDIR%%/app/controllers/concerns/requires_whitelisted_monitoring_client.rb %%WWWDIR%%/app/controllers/concerns/routable_actions.rb +%%WWWDIR%%/app/controllers/concerns/send_file_upload.rb %%WWWDIR%%/app/controllers/concerns/service_params.rb %%WWWDIR%%/app/controllers/concerns/snippets_actions.rb %%WWWDIR%%/app/controllers/concerns/spammable_actions.rb @@ -3046,6 +3108,7 @@ %%WWWDIR%%/app/controllers/groups/group_members_controller.rb %%WWWDIR%%/app/controllers/groups/labels_controller.rb %%WWWDIR%%/app/controllers/groups/milestones_controller.rb +%%WWWDIR%%/app/controllers/groups/settings/badges_controller.rb %%WWWDIR%%/app/controllers/groups/settings/ci_cd_controller.rb %%WWWDIR%%/app/controllers/groups/uploads_controller.rb %%WWWDIR%%/app/controllers/groups/variables_controller.rb @@ -3053,6 +3116,7 @@ %%WWWDIR%%/app/controllers/health_check_controller.rb %%WWWDIR%%/app/controllers/health_controller.rb %%WWWDIR%%/app/controllers/help_controller.rb +%%WWWDIR%%/app/controllers/ide_controller.rb %%WWWDIR%%/app/controllers/import/base_controller.rb %%WWWDIR%%/app/controllers/import/bitbucket_controller.rb %%WWWDIR%%/app/controllers/import/fogbugz_controller.rb @@ -3096,6 +3160,7 @@ %%WWWDIR%%/app/controllers/projects/branches_controller.rb %%WWWDIR%%/app/controllers/projects/build_artifacts_controller.rb %%WWWDIR%%/app/controllers/projects/builds_controller.rb +%%WWWDIR%%/app/controllers/projects/ci/lints_controller.rb %%WWWDIR%%/app/controllers/projects/clusters/applications_controller.rb %%WWWDIR%%/app/controllers/projects/clusters/gcp_controller.rb %%WWWDIR%%/app/controllers/projects/clusters/user_controller.rb @@ -3106,6 +3171,7 @@ %%WWWDIR%%/app/controllers/projects/cycle_analytics/events_controller.rb %%WWWDIR%%/app/controllers/projects/cycle_analytics_controller.rb %%WWWDIR%%/app/controllers/projects/deploy_keys_controller.rb +%%WWWDIR%%/app/controllers/projects/deploy_tokens_controller.rb %%WWWDIR%%/app/controllers/projects/deployments_controller.rb %%WWWDIR%%/app/controllers/projects/discussions_controller.rb %%WWWDIR%%/app/controllers/projects/environments_controller.rb @@ -3153,6 +3219,7 @@ %%WWWDIR%%/app/controllers/projects/runner_projects_controller.rb %%WWWDIR%%/app/controllers/projects/runners_controller.rb %%WWWDIR%%/app/controllers/projects/services_controller.rb +%%WWWDIR%%/app/controllers/projects/settings/badges_controller.rb %%WWWDIR%%/app/controllers/projects/settings/ci_cd_controller.rb %%WWWDIR%%/app/controllers/projects/settings/integrations_controller.rb %%WWWDIR%%/app/controllers/projects/settings/repository_controller.rb @@ -3245,6 +3312,7 @@ %%WWWDIR%%/app/helpers/conversational_development_index_helper.rb %%WWWDIR%%/app/helpers/dashboard_helper.rb %%WWWDIR%%/app/helpers/defer_script_tag_helper.rb +%%WWWDIR%%/app/helpers/deploy_tokens_helper.rb %%WWWDIR%%/app/helpers/diff_helper.rb %%WWWDIR%%/app/helpers/dropdowns_helper.rb %%WWWDIR%%/app/helpers/emails_helper.rb @@ -3381,6 +3449,7 @@ %%WWWDIR%%/app/models/chat_team.rb %%WWWDIR%%/app/models/ci/artifact_blob.rb %%WWWDIR%%/app/models/ci/build.rb +%%WWWDIR%%/app/models/ci/build_metadata.rb %%WWWDIR%%/app/models/ci/build_trace_section.rb %%WWWDIR%%/app/models/ci/build_trace_section_name.rb %%WWWDIR%%/app/models/ci/group.rb @@ -3415,6 +3484,7 @@ %%WWWDIR%%/app/models/compare.rb %%WWWDIR%%/app/models/concerns/access_requestable.rb %%WWWDIR%%/app/models/concerns/artifact_migratable.rb +%%WWWDIR%%/app/models/concerns/atomic_internal_id.rb %%WWWDIR%%/app/models/concerns/avatarable.rb %%WWWDIR%%/app/models/concerns/awardable.rb %%WWWDIR%%/app/models/concerns/blob_like.rb @@ -3422,6 +3492,7 @@ %%WWWDIR%%/app/models/concerns/bulk_member_access_load.rb %%WWWDIR%%/app/models/concerns/cache_markdown_field.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/discussion_on_diff.rb @@ -3436,13 +3507,13 @@ %%WWWDIR%%/app/models/concerns/has_variable.rb %%WWWDIR%%/app/models/concerns/ignorable_column.rb %%WWWDIR%%/app/models/concerns/importable.rb -%%WWWDIR%%/app/models/concerns/internal_id.rb %%WWWDIR%%/app/models/concerns/issuable.rb %%WWWDIR%%/app/models/concerns/loaded_in_group_list.rb %%WWWDIR%%/app/models/concerns/manual_inverse_association.rb %%WWWDIR%%/app/models/concerns/mentionable.rb %%WWWDIR%%/app/models/concerns/mentionable/reference_regexes.rb *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806051932.w55JWo0n064537>