Date: Tue, 20 Feb 2018 15:42:54 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462404 - in head/www/gitlab: . files Message-ID: <201802201542.w1KFgsS4003322@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Tue Feb 20 15:42:53 2018 New Revision: 462404 URL: https://svnweb.freebsd.org/changeset/ports/462404 Log: www/gitlab: Update from 10.1.6 to 10.4.4 Changelog: https://github.com/gitlabhq/gitlabhq/blob/v10.4.4/CHANGELOG.md Submitted by: Matthias Fechner <idefix@fechner.net> Reviewed by: swills, tz Deleted: head/www/gitlab/files/patch-config_database.yml.postgresql Modified: head/www/gitlab/Makefile head/www/gitlab/distinfo head/www/gitlab/files/gitlab.in head/www/gitlab/files/patch-Gemfile head/www/gitlab/files/patch-config_gitlab.yml.example head/www/gitlab/files/patch-config_initializers_1__settings.rb head/www/gitlab/pkg-message head/www/gitlab/pkg-plist Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/Makefile Tue Feb 20 15:42:53 2018 (r462404) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= gitlab -PORTVERSION= 10.1.6 +PORTVERSION= 10.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -25,9 +24,9 @@ BUILD_DEPENDS= gem:devel/ruby-gems # which makes maintaining this long list much easier! # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options -RUN_DEPENDS= git>=2.14.1:devel/git \ - gitlab-shell>=5.9.3:devel/gitlab-shell\ - gitlab-workhorse>=2.0.0:www/gitlab-workhorse \ +RUN_DEPENDS= git>=2.14.3:devel/git \ + gitlab-shell>=5.11.0:devel/gitlab-shell\ + gitlab-workhorse>=3.3.1:www/gitlab-workhorse \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ @@ -42,8 +41,8 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-devise>=4.2:devel/rubygem-devise \ rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.2.0:security/rubygem-doorkeeper-openid_connect \ - rubygem-omniauth>=1.4.2:security/rubygem-omniauth \ - rubygem-omniauth-auth0>=1.4.1:net/rubygem-omniauth-auth0 \ + rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \ + rubygem-omniauth-auth014>=1.4.1:net/rubygem-omniauth-auth014 \ 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 \ @@ -52,18 +51,18 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-omniauth-google-oauth2>=0.5.2: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-saml>=1.7.0:security/rubygem-omniauth-saml \ - rubygem-omniauth-shibboleth>=1.2.0:security/rubygem-omniauth-shibboleth \ - rubygem-omniauth-twitter>=1.2.0:net/rubygem-omniauth-twitter \ - rubygem-omniauth_crowd>=2.2.0:devel/rubygem-omniauth_crowd \ + rubygem-omniauth-saml17>=1.7.0:security/rubygem-omniauth-saml17 \ + rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \ + rubygem-omniauth-twitter12>=1.2.0:net/rubygem-omniauth-twitter12 \ + rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \ - rubygem-rack-oauth2>=1.2.1:security/rubygem-rack-oauth2 \ + rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ - rubygem-recaptcha>=3.0:devel/rubygem-recaptcha \ + 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-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ - rubygem-attr_encrypted>=3.0.0:security/rubygem-attr_encrypted \ + rubygem-attr_encrypted30>=3.0.0:security/rubygem-attr_encrypted30 \ 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 \ @@ -72,25 +71,25 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \ rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \ - rubygem-github-linguist>=4.7.0:textproc/rubygem-github-linguist \ + rubygem-github-linguist47>=4.7.0:textproc/rubygem-github-linguist47 \ rubygem-grape>=1.0:devel/rubygem-grape \ - rubygem-grape-entity>=0.6.0:devel/rubygem-grape-entity \ - rubygem-rack-cors0>=0.4.0:www/rubygem-rack-cors0 \ + rubygem-grape-entity060>=0.6.0:devel/rubygem-grape-entity060 \ + rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ - rubygem-hamlit>=2.6.1:www/rubygem-hamlit \ + rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \ rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ - rubygem-dropzonejs-rails>=0.7.1:www/rubygem-dropzonejs-rails \ + rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-fog-aws1>=1.4:net/rubygem-fog-aws1 \ - rubygem-fog-core>=1.44:devel/rubygem-fog-core \ - rubygem-fog-google>=0.5:net/rubygem-fog-google \ + rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ + rubygem-fog-google0>=0.5:net/rubygem-fog-google0 \ 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-unf>=0.1.4:textproc/rubygem-unf \ - rubygem-seed-fu>=2.3.5:databases/rubygem-seed-fu \ + rubygem-seed-fu236>=2.3.6:databases/rubygem-seed-fu236 \ rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ @@ -99,45 +98,45 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-rdoc>=4.2:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0:textproc/rubygem-creole \ - rubygem-wikicloth>=0.8.1:textproc/rubygem-wikicloth \ + rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \ - rubygem-asciidoctor-plantuml>=0.0.7:textproc/rubygem-asciidoctor-plantuml \ + rubygem-asciidoctor-plantuml007>=0.0.7:textproc/rubygem-asciidoctor-plantuml007 \ 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 \ rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \ - rubygem-diffy>=3.1.0:textproc/rubygem-diffy \ - rubygem-unicorn>=5.1.0:www/rubygem-unicorn \ - rubygem-unicorn-worker-killer>=0.4.4:www/rubygem-unicorn-worker-killer \ + 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-sidekiq>=5.0.0:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \ - rubygem-redis-namespace>=1.5.2:databases/rubygem-redis-namespace \ + rubygem-redis-namespace15>=1.5.2:databases/rubygem-redis-namespace15 \ rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \ rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow2>=2.2:devel/rubygem-rainbow2 \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ - rubygem-version_sorter>=2.1.0:textproc/rubygem-version_sorter \ + rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ - rubygem-hipchat>=1.5.0:net-im/rubygem-hipchat \ + rubygem-hipchat15>=1.5.0:net-im/rubygem-hipchat15 \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \ rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-asana>=0.6.0:www/rubygem-asana \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ - rubygem-kubeclient>=2.2.0:www/rubygem-kubeclient \ + rubygem-kubeclient22>=2.2.0:www/rubygem-kubeclient22 \ 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.0.3:textproc/rubygem-loofah \ + rubygem-loofah20>=2.0.3:textproc/rubygem-loofah20 \ rubygem-licensee8>=8.7:devel/rubygem-licensee8 \ - rubygem-rack-attack>=4.4.1:www/rubygem-rack-attack \ + 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 \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ @@ -147,25 +146,26 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \ rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \ rubygem-sass-rails-rails4>=5.0.6:textproc/rubygem-sass-rails-rails4 \ - rubygem-uglifier>=2.7.2:www/rubygem-uglifier \ + rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable>=2.5.2:www/rubygem-addressable \ rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \ rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ - rubygem-gon>=6.1.0:www/rubygem-gon \ - rubygem-jquery-atwho-rails>=1.3.2:www/rubygem-jquery-atwho-rails \ + 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-premailer-rails>=1.9.7:mail/rubygem-premailer-rails \ + rubygem-sentry-raven25>=2.5.3:devel/rubygem-sentry-raven25 \ + 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_js>=1.2.0:devel/rubygem-gettext_i18n_rails_js \ + rubygem-gettext_i18n_rails_js12>=1.2.0:devel/rubygem-gettext_i18n_rails_js12 \ 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 \ @@ -173,28 +173,29 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ 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.7.0.beta18:devel/rubygem-prometheus-client-mmap \ - rubygem-octokit>=4.6.2:net/rubygem-octokit \ + rubygem-prometheus-client-mmap>=0.7.0.beta44:devel/rubygem-prometheus-client-mmap \ + rubygem-octokit46>=4.6.2:net/rubygem-octokit46 \ 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-prof>=0.16.2:devel/rubygem-ruby-prof \ + rubygem-ruby-prof016>=0.16.2:devel/rubygem-ruby-prof016 \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ - rubygem-paranoia>=2.3.1:databases/rubygem-paranoia \ - rubygem-health_check>=2.6.0:devel/rubygem-health_check \ + 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-ssh>=4.1.0:security/rubygem-net-ssh \ + rubygem-net-ssh41>=4.1.0:security/rubygem-net-ssh41 \ 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-proto>=0.39.0:net/rubygem-gitaly-proto \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ - rubygem-toml-rb>=0.3.15:www/rubygem-toml-rb \ - rubygem-flipper010>=0.10.2:devel/rubygem-flipper010 \ - rubygem-flipper-active_record010>=0.10.2:databases/rubygem-flipper-active_record010 \ + rubygem-toml-rb03>=0.3.15:www/rubygem-toml-rb03 \ + 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-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 PGSQL_RUN_DEPENDS= rubygem-pg>=0.18.2:databases/rubygem-pg \ @@ -242,7 +243,7 @@ do-install: ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample - ${MKDIR} ${STAGEDIR}/home/git/repositories + ${MKDIR} ${STAGEDIR}/usr/home/git/repositories ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache Modified: head/www/gitlab/distinfo ============================================================================== --- head/www/gitlab/distinfo Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/distinfo Tue Feb 20 15:42:53 2018 (r462404) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516175210 -SHA256 (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = b01bd5e10adb5b21c4cafc5e9fe5fa388c52fe7546708d0ed58f57644bc76b9c -SIZE (gitlabhq-gitlabhq-v10.1.6_GH0.tar.gz) = 41739152 +TIMESTAMP = 1518865521 +SHA256 (gitlabhq-gitlabhq-v10.4.4_GH0.tar.gz) = 552572672bd5228194636739bcbd37689c650895093fa5b945e9d0937ae767dd +SIZE (gitlabhq-gitlabhq-v10.4.4_GH0.tar.gz) = 43410230 Modified: head/www/gitlab/files/gitlab.in ============================================================================== --- head/www/gitlab/files/gitlab.in Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/files/gitlab.in Tue Feb 20 15:42:53 2018 (r462404) @@ -41,6 +41,7 @@ restart_cmd="restart_gitlab" : ${gitlab_authBackend:="http://127.0.0.1:8080"} : ${gitlab_workhorse_tcp:="NO"} : ${gitlab_workhorse_addr:="127.0.0.1:8181"} +: ${gitlab_mail_room_enable:="NO"} load_rc_config $name @@ -56,7 +57,11 @@ socket_path="$app_root/tmp/sockets" rails_socket="$socket_path/gitlab.socket" web_server_pid_path="$pid_path/unicorn.pid" sidekiq_pid_path="$pid_path/sidekiq.pid" -mail_room_enabled=false +if checkyesno gitlab_mail_room_enable; then + mail_room_enabled=true +else + mail_room_enabled=false +fi mail_room_pid_path="$pid_path/mail_room.pid" gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/files/patch-Gemfile Tue Feb 20 15:42:53 2018 (r462404) @@ -1,155 +1,26 @@ ---- Gemfile.orig 2018-01-11 16:23:59 UTC +--- Gemfile.orig 2018-02-05 13:37:24 UTC +++ Gemfile -@@ -1,55 +1,55 @@ - source 'https://rubygems.org' - --gem 'rails', '4.2.8' -+gem 'rails', '>=4.2.8' - gem 'rails-deprecated_sanitizer', '~> 1.0.3' - - # Responders respond_to and respond_with - gem 'responders', '~> 2.0' - --gem 'sprockets', '~> 3.7.0' -+gem 'sprockets', '>= 3.7.0' - - # Default values for AR models +@@ -12,8 +12,8 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' # Supported DBs --gem 'mysql2', '~> 0.4.5', group: :mysql +-gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres -+gem 'mysql2', '>= 0.4.5', group: :mysql ++gem 'mysql2', '>= 0.4.10', group: :mysql +gem 'pg', '>= 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' gem 'grape-route-helpers', '~> 2.1.0' +@@ -109,7 +109,7 @@ gem 'fog-rackspace', '~> 0.1.1' + gem 'fog-aliyun', '~> 0.2.0' --gem 'faraday', '~> 0.12' -+gem 'faraday', '>= 0.12' - - # Authentication libraries - gem 'devise', '~> 4.2' - gem 'doorkeeper', '~> 4.2.0' - gem 'doorkeeper-openid_connect', '~> 1.2.0' --gem 'omniauth', '~> 1.4.2' --gem 'omniauth-auth0', '~> 1.4.1' -+gem 'omniauth', '>= 1.4.2' -+gem 'omniauth-auth0', '>= 1.4.1' - gem 'omniauth-azure-oauth2', '~> 0.0.9' - gem 'omniauth-cas3', '~> 1.1.4' - gem 'omniauth-facebook', '~> 4.0.0' - gem 'omniauth-github', '~> 1.1.1' - gem 'omniauth-gitlab', '~> 1.0.2' --gem 'omniauth-google-oauth2', '~> 0.5.2' -+gem 'omniauth-google-oauth2', '>= 0.5.2' - gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos - gem 'omniauth-oauth2-generic', '~> 0.2.2' --gem 'omniauth-saml', '~> 1.7.0' --gem 'omniauth-shibboleth', '~> 1.2.0' --gem 'omniauth-twitter', '~> 1.2.0' --gem 'omniauth_crowd', '~> 2.2.0' -+gem 'omniauth-saml', '>= 1.7.0' -+gem 'omniauth-shibboleth', '>= 1.2.0' -+gem 'omniauth-twitter', '>= 1.2.0' -+gem 'omniauth_crowd', '>= 2.2.0' - gem 'omniauth-authentiq', '~> 0.3.1' --gem 'rack-oauth2', '~> 1.2.1' -+gem 'rack-oauth2', '>= 1.2.1' - gem 'jwt', '~> 1.5.6' - - # Spam and anti-bot protection --gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' -+gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails' - gem 'akismet', '~> 2.0' - - # Two-factor authentication - gem 'devise-two-factor', '~> 3.0.0' - gem 'rqrcode-rails3', '~> 0.1.7' --gem 'attr_encrypted', '~> 3.0.0' -+gem 'attr_encrypted', '~> 3.0' - gem 'u2f', '~> 0.2.1' - - # GitLab Pages -@@ -73,11 +73,11 @@ gem 'gollum-lib', '~> 4.2', require: fal - gem 'gollum-rugged_adapter', '~> 0.4.4', require: false - - # Language detection --gem 'github-linguist', '~> 4.7.0', require: 'linguist' -+gem 'github-linguist', '>= 4.7.0', require: 'linguist' - - # API - gem 'grape', '~> 1.0' --gem 'grape-entity', '~> 0.6.0' -+gem 'grape-entity', '~> 0.6' - gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' - - # Disable strong_params so that Mash does not respond to :permitted? -@@ -87,25 +87,25 @@ gem 'hashie-forbidden_attributes' - gem 'kaminari', '~> 1.0' - - # HAML --gem 'hamlit', '~> 2.6.1' -+gem 'hamlit', '>= 2.6.1' - - # Files attachments --gem 'carrierwave', '~> 1.1' -+gem 'carrierwave', '>= 1.1' - - # Drag and Drop UI --gem 'dropzonejs-rails', '~> 0.7.1' -+gem 'dropzonejs-rails', '>= 0.7.1' - - # for backups - gem 'fog-aws', '~> 1.4' --gem 'fog-core', '~> 1.44' --gem 'fog-google', '~> 0.5' -+gem 'fog-core', '>= 1.44' -+gem 'fog-google', '>= 0.5' - gem 'fog-local', '~> 0.3' - gem 'fog-openstack', '~> 0.1' - gem 'fog-rackspace', '~> 0.1.1' --gem 'fog-aliyun', '~> 0.1.0' -+gem 'fog-aliyun', '>= 0.1.0' - # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '>= 0.13.6' # for aws storage gem 'unf', '~> 0.1.4' -@@ -115,32 +115,32 @@ gem 'seed-fu', '~> 2.3.5' - - # Markdown and HTML processing - gem 'html-pipeline', '~> 1.11.0' --gem 'deckar01-task_list', '2.0.0' --gem 'gitlab-markup', '~> 1.6.2' -+gem 'deckar01-task_list', '>= 2.0.0' -+gem 'gitlab-markup', '>= 1.6.2' - gem 'redcarpet', '~> 3.4' - gem 'RedCloth', '~> 4.3.2' - gem 'rdoc', '~> 4.2' - gem 'org-ruby', '~> 0.9.12' - gem 'creole', '~> 0.5.0' --gem 'wikicloth', '0.8.1' -+gem 'wikicloth', '>= 0.8.1' - gem 'asciidoctor', '~> 1.5.2' --gem 'asciidoctor-plantuml', '0.0.7' -+gem 'asciidoctor-plantuml', '>= 0.0.7' - gem 'rouge', '~> 2.0' - gem 'truncato', '~> 0.7.9' - gem 'bootstrap_form', '~> 2.7.0' - gem 'nokogiri', '~> 1.8.1' - - # Diffs --gem 'diffy', '~> 3.1.0' -+gem 'diffy', '>= 3.1.0' - - # Application server - group :unicorn do -- gem 'unicorn', '~> 5.1.0' -+ gem 'unicorn', '>= 5.1.0' - gem 'unicorn-worker-killer', '~> 0.4.4' +@@ -144,7 +144,7 @@ group :unicorn do end # State machine @@ -158,15 +29,7 @@ # Issue tags gem 'acts-as-taggable-on', '~> 4.0' -@@ -148,17 +148,17 @@ gem 'acts-as-taggable-on', '~> 4.0' - # Background jobs - gem 'sidekiq', '~> 5.0' - gem 'sidekiq-cron', '~> 0.6.0' --gem 'redis-namespace', '~> 1.5.2' -+gem 'redis-namespace', '>= 1.5.2' - gem 'sidekiq-limit_fetch', '~> 3.4', require: false - - # Cron Parser +@@ -159,7 +159,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests @@ -174,44 +37,8 @@ +gem 'httparty', '>= 0.13.3' # Colored output to console --gem 'rainbow', '~> 2.2' -+gem 'rainbow', '>= 2.2' - - # GitLab settings - gem 'settingslogic', '~> 2.0.9' -@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1' - - # Misc - --gem 'version_sorter', '~> 2.1.0' -+gem 'version_sorter', '>= 2.1.0' - - # Cache - gem 'redis-rails', '~> 5.0.2' - - # Redis --gem 'redis', '~> 3.2' -+gem 'redis', '>= 3.2' - gem 'connection_pool', '~> 2.0' - - # HipChat integration --gem 'hipchat', '~> 1.5.0' -+gem 'hipchat', '>= 1.5.0' - - # JIRA integration --gem 'jira-ruby', '~> 1.4' -+gem 'jira-ruby', '>= 1.4' - - # Flowdock integration - gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -@@ -199,23 +199,23 @@ gem 'asana', '~> 0.6.0' - gem 'ruby-fogbugz', '~> 0.2.1' - - # Kubernetes integration --gem 'kubeclient', '~> 2.2.0' -+gem 'kubeclient', '>= 2.2.0' - - # d3 + gem 'rainbow', '~> 2.2' +@@ -209,7 +209,7 @@ gem 'kubeclient', '~> 2.2.0' gem 'd3_rails', '~> 3.5.0' # Sanitize user input @@ -220,74 +47,16 @@ gem 'babosa', '~> 1.0.2' # Sanitizes SVG input --gem 'loofah', '~> 2.0.3' -+gem 'loofah', '>= 2.0.3' - - # Working with license - gem 'licensee', '~> 8.7.0' - - # Protect against bruteforcing --gem 'rack-attack', '~> 4.4.1' -+gem 'rack-attack', '>= 4.4.1' - - # Ace editor - gem 'ace-rails-ap', '~> 4.1.0' -@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2' - gem 'chronic_duration', '~> 0.10.6' - - gem 'webpack-rails', '~> 0.9.10' --gem 'rack-proxy', '~> 0.6.0' -+gem 'rack-proxy', '>= 0.6.0' - - gem 'sass-rails', '~> 5.0.6' --gem 'uglifier', '~> 2.7.2' -+gem 'uglifier', '>= 2.7.2' - --gem 'addressable', '~> 2.5.2' -+gem 'addressable', '>= 2.5.2' - gem 'bootstrap-sass', '~> 3.3.0' - gem 'font-awesome-rails', '~> 4.7' - gem 'gemojione', '~> 3.3' --gem 'gon', '~> 6.1.0' --gem 'jquery-atwho-rails', '~> 1.3.2' --gem 'jquery-rails', '~> 4.1.0' --gem 'request_store', '~> 1.3' -+gem 'gon', '>= 6.1.0' -+gem 'jquery-atwho-rails', '>= 1.3.2' -+gem 'jquery-rails', '>= 4.1.0' -+gem 'request_store', '>= 1.3' - gem 'select2-rails', '~> 3.5.9' - 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' -+gem 'premailer-rails', '>= 1.9.7' - - # I18n - gem 'ruby_parser', '~> 3.8', require: false - gem 'rails-i18n', '~> 4.0.9' - gem 'gettext_i18n_rails', '~> 1.8.0' --gem 'gettext_i18n_rails_js', '~> 1.2.0' -+gem 'gettext_i18n_rails_js', '>= 1.2.0' - gem 'gettext', '~> 3.2.2', require: false, group: :development - - # Perf bar +@@ -273,7 +273,7 @@ gem 'batch-loader', '~> 1.2.1' 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-performance_bar', '~> 1.3.0' --gem 'peek-pg', '~> 1.3.0', group: :postgres +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-performance_bar', '~> 1.3.0' + gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' - gem 'peek-redis', '~> 1.2.0' - gem 'peek-sidekiq', '~> 1.0.3' +@@ -282,97 +282,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do @@ -296,7 +65,7 @@ - gem 'influxdb', '~> 0.2', require: false - # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta18' + gem 'prometheus-client-mmap', '~> 0.7.0.beta44' gem 'raindrops', '~> 0.18' end @@ -324,7 +93,7 @@ - gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.5.0' -- gem 'factory_girl_rails', '~> 4.7.0' +- gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.6.0' - gem 'rspec-retry', '~> 0.4.5' - gem 'spinach-rails', '~> 0.2.1' @@ -339,18 +108,20 @@ - # Generate Fake data - gem 'ffaker', '~> 2.4' - -- gem 'capybara', '~> 2.15.0' +- gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' -- gem 'poltergeist', '~> 1.9.0' +- gem 'selenium-webdriver', '~> 3.5' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.1.0' - -- gem 'rubocop', '~> 0.49.1', require: false -- gem 'rubocop-rspec', '~> 1.15.1', require: false -- gem 'rubocop-gitlab-security', '~> 0.1.0', require: false -- gem 'scss_lint', '~> 0.54.0', require: false +- gem 'gitlab-styles', '~> 2.2.0', require: false +- # Pin these dependencies, otherwise a new rule could break the CI pipelines +- gem 'rubocop', '~> 0.52.0' +- gem 'rubocop-rspec', '~> 1.20.1' +- +- gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.26.0', require: false - gem 'simplecov', '~> 0.14.0', require: false - gem 'flay', '~> 2.8.0', require: false @@ -358,7 +129,7 @@ - - gem 'benchmark-ips', '~> 2.3.0', require: false - -- gem 'license_finder', '~> 2.1.0', require: false +- gem 'license_finder', '~> 3.1', require: false - gem 'knapsack', '~> 1.11.0' - - gem 'activerecord_sane_schema_dumper', '0.2' @@ -380,59 +151,24 @@ - gem 'test-prof', '~> 0.2.5' -end - --gem 'octokit', '~> 4.6.2' -+gem 'octokit', '>= 4.6.2' + gem 'octokit', '~> 4.6.2' gem 'mail_room', '~> 0.9.1' - --gem 'email_reply_trimmer', '~> 0.1' -+gem 'email_reply_trimmer', '>= 0.1' - gem 'html2text' - --gem 'ruby-prof', '~> 0.16.2' -+gem 'ruby-prof', '>= 0.16.2' - - # OAuth --gem 'oauth2', '~> 1.4' -+gem 'oauth2', '>= 1.4' - - # Soft deletion --gem 'paranoia', '~> 2.3.1' -+gem 'paranoia', '>= 2.3.1' - - # Health check --gem 'health_check', '~> 2.6.0' -+gem 'health_check', '>= 2.6.0' - - # System information - gem 'vmstat', '~> 2.3.0' - gem 'sys-filesystem', '~> 1.1.6' - - # SSH host key support --gem 'net-ssh', '~> 4.1.0' -+gem 'net-ssh', '>= 4.1.0' - - # Required for ED25519 SSH host key support - group :ed25519 do - gem 'rbnacl-libsodium' -- gem 'rbnacl', '~> 4.0' -+ gem 'rbnacl', '~> 4.0.2' - gem 'bcrypt_pbkdf', '~> 1.0' +@@ -403,7 +317,7 @@ group :ed25519 do end # Gitaly GRPC client --gem 'gitaly-proto', '~> 0.39.0', require: 'gitaly' -+gem 'gitaly-proto', '>= 0.39.0', require: 'gitaly' +-gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly' ++gem 'gitaly-proto', '>= 0.64.0', require: 'gitaly' --gem 'toml-rb', '~> 0.3.15', require: false -+gem 'toml-rb', '>= 0.3.15', require: false + gem 'toml-rb', '~> 0.3.15', require: false - # Feature toggles - gem 'flipper', '~> 0.10.2' -@@ -409,3 +325,6 @@ gem 'flipper-active_record', '~> 0.10.2' - # Structured logging +@@ -416,5 +330,8 @@ gem 'flipper-active_support_cache_store' gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' -+ + +gem 'rinku' + ++ + # Asset synchronization + gem 'asset_sync', '~> 2.2.0' Modified: head/www/gitlab/files/patch-config_gitlab.yml.example ============================================================================== --- head/www/gitlab/files/patch-config_gitlab.yml.example Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/files/patch-config_gitlab.yml.example Tue Feb 20 15:42:53 2018 (r462404) @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2017-11-14 20:51:25 UTC +--- config/gitlab.yml.example.orig 2018-01-22 14:26:07 UTC +++ config/gitlab.yml.example -@@ -519,8 +519,8 @@ production: &base +@@ -520,8 +520,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -11,7 +11,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -548,12 +548,12 @@ production: &base +@@ -549,12 +549,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -27,7 +27,7 @@ # Git over HTTP upload_pack: true -@@ -574,7 +574,7 @@ production: &base +@@ -575,7 +575,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: Modified: head/www/gitlab/files/patch-config_initializers_1__settings.rb ============================================================================== --- head/www/gitlab/files/patch-config_initializers_1__settings.rb Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/files/patch-config_initializers_1__settings.rb Tue Feb 20 15:42:53 2018 (r462404) @@ -1,4 +1,4 @@ ---- config/initializers/1_settings.rb.orig 2017-11-14 20:51:25 UTC +--- config/initializers/1_settings.rb.orig 2018-01-22 14:26:07 UTC +++ config/initializers/1_settings.rb @@ -249,12 +249,8 @@ Settings.gitlab['email_subject_suffix'] Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) @@ -13,5 +13,5 @@ +Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user'] +Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? - Settings.gitlab['password_authentication_enabled'] ||= true if Settings.gitlab['password_authentication_enabled'].nil? + Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) Modified: head/www/gitlab/pkg-message ============================================================================== --- head/www/gitlab/pkg-message Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/pkg-message Tue Feb 20 15:42:53 2018 (r462404) @@ -3,7 +3,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/10.1-freebsd.md +http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/install/10.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: @@ -11,6 +11,6 @@ the instructions in the guide at: http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/freebsd_patch_versions.md If you just installed an major upgrade of GitLab, for example you -switched from 9.4.x to 10.1.x, please follow the instructions in the guide at: +switched from 10.1.x to 10.4.x, please follow the instructions in the guide at: -http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/9.4-to-10.1-freebsd.md +http://gitlab.toco-domains.de/FreeBSD/GitLab-docu/blob/master/update/10.1-to-10.4-freebsd.md Modified: head/www/gitlab/pkg-plist ============================================================================== --- head/www/gitlab/pkg-plist Tue Feb 20 15:39:52 2018 (r462403) +++ head/www/gitlab/pkg-plist Tue Feb 20 15:42:53 2018 (r462404) @@ -13,6 +13,7 @@ %%WWWDIR%%/.gitlab/issue_templates/Research Proposal.md %%WWWDIR%%/.gitlab/merge_request_templates/Database Changes.md %%WWWDIR%%/.gitlab/merge_request_templates/Documentation.md +%%WWWDIR%%/.gitlab/route-map.yml %%WWWDIR%%/.haml-lint.yml %%WWWDIR%%/.mailmap %%WWWDIR%%/.nvmrc @@ -833,6 +834,7 @@ %%WWWDIR%%/app/assets/images/emoji/full_moon.png %%WWWDIR%%/app/assets/images/emoji/full_moon_with_face.png %%WWWDIR%%/app/assets/images/emoji/game_die.png +%%WWWDIR%%/app/assets/images/emoji/gay_pride_flag.png %%WWWDIR%%/app/assets/images/emoji/gear.png %%WWWDIR%%/app/assets/images/emoji/gem.png %%WWWDIR%%/app/assets/images/emoji/gemini.png @@ -1597,6 +1599,7 @@ %%WWWDIR%%/app/assets/images/emoji/speaker.png %%WWWDIR%%/app/assets/images/emoji/speaking_head.png %%WWWDIR%%/app/assets/images/emoji/speech_balloon.png +%%WWWDIR%%/app/assets/images/emoji/speech_left.png %%WWWDIR%%/app/assets/images/emoji/speedboat.png %%WWWDIR%%/app/assets/images/emoji/spider.png %%WWWDIR%%/app/assets/images/emoji/spider_web.png @@ -1861,27 +1864,65 @@ %%WWWDIR%%/app/assets/images/emoji@2x.png %%WWWDIR%%/app/assets/images/favicon-blue.ico %%WWWDIR%%/app/assets/images/favicon.ico +%%WWWDIR%%/app/assets/images/file_icons.svg %%WWWDIR%%/app/assets/images/gitlab_logo.png %%WWWDIR%%/app/assets/images/gitorious-logo-black.png %%WWWDIR%%/app/assets/images/gitorious-logo-blue.png %%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/icon_image_comment.svg -%%WWWDIR%%/app/assets/images/icon_image_comment@2x.svg %%WWWDIR%%/app/assets/images/icons.json %%WWWDIR%%/app/assets/images/icons.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_file_editor_empty.svg +%%WWWDIR%%/app/assets/images/illustrations/no_commits.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 @@ -1898,6 +1939,8 @@ %%WWWDIR%%/app/assets/images/mailers/gitlab_tanuki_2x.png %%WWWDIR%%/app/assets/images/monokai-scheme-preview.png %%WWWDIR%%/app/assets/images/msapplication-tile.png +%%WWWDIR%%/app/assets/images/multi-editor-off.png +%%WWWDIR%%/app/assets/images/multi-editor-on.png %%WWWDIR%%/app/assets/images/new_repo.png %%WWWDIR%%/app/assets/images/no_avatar.png %%WWWDIR%%/app/assets/images/no_group_avatar.png @@ -1916,16 +1959,18 @@ %%WWWDIR%%/app/assets/javascripts/admin.js %%WWWDIR%%/app/assets/javascripts/ajax_loading_spinner.js %%WWWDIR%%/app/assets/javascripts/api.js -%%WWWDIR%%/app/assets/javascripts/aside.js %%WWWDIR%%/app/assets/javascripts/autosave.js %%WWWDIR%%/app/assets/javascripts/awards_handler.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/quick_submit.js %%WWWDIR%%/app/assets/javascripts/behaviors/requires_input.js +%%WWWDIR%%/app/assets/javascripts/behaviors/secret_values.js %%WWWDIR%%/app/assets/javascripts/behaviors/toggler_behavior.js %%WWWDIR%%/app/assets/javascripts/blob/3d_viewer/index.js %%WWWDIR%%/app/assets/javascripts/blob/3d_viewer/mesh_object.js @@ -1955,7 +2000,7 @@ %%WWWDIR%%/app/assets/javascripts/boards/boards_bundle.js %%WWWDIR%%/app/assets/javascripts/boards/components/board.js %%WWWDIR%%/app/assets/javascripts/boards/components/board_blank_state.js -%%WWWDIR%%/app/assets/javascripts/boards/components/board_card.js +%%WWWDIR%%/app/assets/javascripts/boards/components/board_card.vue %%WWWDIR%%/app/assets/javascripts/boards/components/board_delete.js %%WWWDIR%%/app/assets/javascripts/boards/components/board_list.js %%WWWDIR%%/app/assets/javascripts/boards/components/board_new_issue.js @@ -1989,12 +2034,18 @@ %%WWWDIR%%/app/assets/javascripts/breadcrumb.js %%WWWDIR%%/app/assets/javascripts/breakpoints.js %%WWWDIR%%/app/assets/javascripts/broadcast_message.js -%%WWWDIR%%/app/assets/javascripts/build.js %%WWWDIR%%/app/assets/javascripts/build_artifacts.js %%WWWDIR%%/app/assets/javascripts/build_variables.js %%WWWDIR%%/app/assets/javascripts/ci_lint_editor.js %%WWWDIR%%/app/assets/javascripts/close_reopen_report_toggle.js -%%WWWDIR%%/app/assets/javascripts/clusters.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 +%%WWWDIR%%/app/assets/javascripts/clusters/event_hub.js +%%WWWDIR%%/app/assets/javascripts/clusters/services/clusters_service.js +%%WWWDIR%%/app/assets/javascripts/clusters/stores/clusters_store.js %%WWWDIR%%/app/assets/javascripts/comment_type_toggle.js %%WWWDIR%%/app/assets/javascripts/commit/image_file.js %%WWWDIR%%/app/assets/javascripts/commit/pipelines/pipelines_bundle.js @@ -2012,8 +2063,7 @@ %%WWWDIR%%/app/assets/javascripts/compare.js %%WWWDIR%%/app/assets/javascripts/compare_autocomplete.js %%WWWDIR%%/app/assets/javascripts/confirm_danger_modal.js -%%WWWDIR%%/app/assets/javascripts/copy_as_gfm.js -%%WWWDIR%%/app/assets/javascripts/copy_to_clipboard.js +%%WWWDIR%%/app/assets/javascripts/contextual_sidebar.js %%WWWDIR%%/app/assets/javascripts/create_label.js %%WWWDIR%%/app/assets/javascripts/create_merge_request_dropdown.js %%WWWDIR%%/app/assets/javascripts/cycle_analytics/components/banner.vue @@ -2056,6 +2106,7 @@ %%WWWDIR%%/app/assets/javascripts/diff_notes/services/resolve.js %%WWWDIR%%/app/assets/javascripts/diff_notes/stores/comments.js %%WWWDIR%%/app/assets/javascripts/dispatcher.js +%%WWWDIR%%/app/assets/javascripts/docs/docs_bundle.js %%WWWDIR%%/app/assets/javascripts/droplab/constants.js %%WWWDIR%%/app/assets/javascripts/droplab/drop_down.js %%WWWDIR%%/app/assets/javascripts/droplab/drop_lab.js @@ -2074,7 +2125,8 @@ %%WWWDIR%%/app/assets/javascripts/emoji/support/index.js %%WWWDIR%%/app/assets/javascripts/emoji/support/is_emoji_unicode_supported.js %%WWWDIR%%/app/assets/javascripts/emoji/support/unicode_support_map.js -%%WWWDIR%%/app/assets/javascripts/environments/components/environment.vue +%%WWWDIR%%/app/assets/javascripts/environments/components/container.vue +%%WWWDIR%%/app/assets/javascripts/environments/components/empty_state.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environment_actions.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environment_external_url.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environment_item.vue @@ -2082,6 +2134,7 @@ %%WWWDIR%%/app/assets/javascripts/environments/components/environment_rollback.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environment_stop.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environment_terminal_button.vue +%%WWWDIR%%/app/assets/javascripts/environments/components/environments_app.vue %%WWWDIR%%/app/assets/javascripts/environments/components/environments_table.vue %%WWWDIR%%/app/assets/javascripts/environments/environments_bundle.js %%WWWDIR%%/app/assets/javascripts/environments/event_hub.js @@ -2129,21 +2182,80 @@ %%WWWDIR%%/app/assets/javascripts/group.js %%WWWDIR%%/app/assets/javascripts/group_avatar.js %%WWWDIR%%/app/assets/javascripts/group_label_subscription.js +%%WWWDIR%%/app/assets/javascripts/groups/components/app.vue %%WWWDIR%%/app/assets/javascripts/groups/components/group_folder.vue %%WWWDIR%%/app/assets/javascripts/groups/components/group_item.vue %%WWWDIR%%/app/assets/javascripts/groups/components/groups.vue +%%WWWDIR%%/app/assets/javascripts/groups/components/item_actions.vue +%%WWWDIR%%/app/assets/javascripts/groups/components/item_caret.vue +%%WWWDIR%%/app/assets/javascripts/groups/components/item_stats.vue +%%WWWDIR%%/app/assets/javascripts/groups/components/item_stats_value.vue +%%WWWDIR%%/app/assets/javascripts/groups/components/item_type_icon.vue +%%WWWDIR%%/app/assets/javascripts/groups/constants.js %%WWWDIR%%/app/assets/javascripts/groups/event_hub.js %%WWWDIR%%/app/assets/javascripts/groups/groups_filterable_list.js %%WWWDIR%%/app/assets/javascripts/groups/index.js -%%WWWDIR%%/app/assets/javascripts/groups/services/groups_service.js -%%WWWDIR%%/app/assets/javascripts/groups/stores/groups_store.js +%%WWWDIR%%/app/assets/javascripts/groups/new_group_child.js +%%WWWDIR%%/app/assets/javascripts/groups/service/groups_service.js +%%WWWDIR%%/app/assets/javascripts/groups/store/groups_store.js %%WWWDIR%%/app/assets/javascripts/groups_list.js %%WWWDIR%%/app/assets/javascripts/groups_select.js %%WWWDIR%%/app/assets/javascripts/header.js %%WWWDIR%%/app/assets/javascripts/help/help.js %%WWWDIR%%/app/assets/javascripts/helpers/issuables_helper.js -%%WWWDIR%%/app/assets/javascripts/helpers/user_feature_helper.js %%WWWDIR%%/app/assets/javascripts/how_to_merge.js +%%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/ide.vue +%%WWWDIR%%/app/assets/javascripts/ide/components/ide_context_bar.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/new_branch_form.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_edit_button.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_buttons.vue *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802201542.w1KFgsS4003322>