Index: head/www/gitlab-ce/Makefile =================================================================== --- head/www/gitlab-ce/Makefile (revision 515491) +++ head/www/gitlab-ce/Makefile (revision 515492) @@ -1,280 +1,279 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.3.3 +PORTVERSION= 12.4.0 PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.21.0:devel/git \ - gitlab-shell>=10.0.0:devel/gitlab-shell \ - gitlab-workhorse>=8.10.0:www/gitlab-workhorse \ - gitaly>=1.65.0:devel/gitaly \ - gitlab-pages>=1.9.0:www/gitlab-pages \ + gitlab-shell>=10.2.0:devel/gitlab-shell \ + gitlab-workhorse>=8.14.0:www/gitlab-workhorse \ + gitaly>=1.67.0:devel/gitaly \ + gitlab-pages>=1.11.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ rubygem-rails52>=5.2.3:www/rubygem-rails52 \ rubygem-bootsnap>=1.4<2.0:devel/rubygem-bootsnap \ rubygem-nakayoshi_fork>=0.0.4<0.1.0:devel/rubygem-nakayoshi_fork \ rubygem-responders2-rails52>=2.0<3.0:www/rubygem-responders2-rails52 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-default_value_for32>=3.2.0<3.3.0:devel/rubygem-default_value_for32 \ rubygem-pg>=1.1<2:databases/rubygem-pg \ rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.1<2.0:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ rubygem-devise-rails52>=4.6<5.0:devel/rubygem-devise-rails52 \ rubygem-doorkeeper43>=4.3<5.0:security/rubygem-doorkeeper43 \ rubygem-doorkeeper-openid_connect>=1.5<2.0:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth>=1.8<2.0:security/rubygem-omniauth \ rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \ rubygem-omniauth-github>=1.3.0<2.0:net/rubygem-omniauth-github \ rubygem-omniauth-gitlab>=1.0.2<1.1.0:security/rubygem-omniauth-gitlab \ rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-kerberos>=0.3.0<0.4.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml>=1.10<2.0:security/rubygem-omniauth-saml \ rubygem-omniauth-shibboleth>=1.3.0<1.4.0:security/rubygem-omniauth-shibboleth \ rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \ rubygem-omniauth_crowd22>=2.2.0<2.3.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ rubygem-omniauth_openid_connect>=0.3.1<0.4.0:net/rubygem-omniauth_openid_connect \ rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \ rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \ rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \ rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ rubygem-akismet>=2.0<3.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=0.12.1<0.13.0:graphics/rubygem-invisible_captcha \ rubygem-devise-two-factor30-rails52>=3.0.0<3.1.0:security/rubygem-devise-two-factor30-rails52 \ rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted>=3.1.0<3.2.0:security/rubygem-attr_encrypted \ rubygem-u2f0>=0.2.1<0.3.0:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.6<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=1.2.2<1.3.0:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.2<2.1.0:security/rubygem-acme-client \ rubygem-browser>=2.5<3.0:www/rubygem-browser \ rubygem-gpgme>=2.0.18<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>0:net/rubygem-net-ldap \ rubygem-grape11>=1.1.0<1.2.0:devel/rubygem-grape11 \ rubygem-grape-entity>=0.7.1<0.8.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.0<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.9.11<1.10.0:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.0.0.b.3<2.1.0:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails52>=1.0<2.0:www/rubygem-kaminari-rails52 \ rubygem-hamlit>=2.8.8<2.9.0:www/rubygem-hamlit \ rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \ rubygem-mini_magick>0:graphics/rubygem-mini_magick \ rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \ rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.9<1.10:net/rubygem-fog-google \ rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ rubygem-google-api-client>=0.23<1.0:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ rubygem-elasticsearch-model019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-model019 \ rubygem-elasticsearch-rails019>=0.1.9<0.2.0:textproc/rubygem-elasticsearch-rails019 \ rubygem-elasticsearch-api503=5.0.3:textproc/rubygem-elasticsearch-api503 \ rubygem-aws-sdk>0:devel/rubygem-aws-sdk \ rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \ rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.2.0<2.3.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.17<1.0:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.0<7.0:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=2.0.10<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml=0.0.9.:textproc/rubygem-asciidoctor-plantuml \ - rubygem-rouge>=3.7<4.0:textproc/rubygem-rouge \ + rubygem-rouge>=3.11.0<3.13:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.10.4<1.11.0:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy31>=3.1.0<3.2.0:textproc/rubygem-diffy31 \ rubygem-rack>=2.0.7<2.1.0,3:www/rubygem-rack \ rubygem-unicorn>=5.4.1<5.5.0:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \ rubygem-puma>=3.12<4.0:www/rubygem-puma \ rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \ rubygem-rack-timeout>=0:www/rubygem-rack-timeout \ rubygem-state_machines-activerecord05>=0.5.1<6.0.0:databases/rubygem-state_machines-activerecord05 \ rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq>=5.2.7<5.3.0:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace>=1.6.0<1.7.0:databases/rubygem-redis-namespace \ rubygem-gitlab-sidekiq-fetcher=0.5.2:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=0.16.4<0.17.0:www/rubygem-httparty \ rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=0:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1<1.2.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.1<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis>=4.0<5.0:databases/rubygem-redis \ rubygem-connection_pool>=2.0<3.0:net/rubygem-connection_pool \ rubygem-redis-rails-rails52>=5.0.2<5.1:www/rubygem-redis-rails-rails52 \ rubygem-discordrb-webhooks-blackst0ne>=3.3<4.0:net-im/rubygem-discordrb-webhooks-blackst0ne \ rubygem-hipchat>=1.6.0<1.7.0:net-im/rubygem-hipchat \ rubygem-jira-ruby>=1.7<2.0:devel/rubygem-jira-ruby \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ rubygem-flowdock>=0.7<1.0:www/rubygem-flowdock \ rubygem-slack-notifier1>=1.5.1<1.6.0:devel/rubygem-slack-notifier1 \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana>=0.8.1<0.9.0:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \ rubygem-kubeclient>=4.4.0<4.5.0:www/rubygem-kubeclient \ rubygem-sanitize>=4.6<5.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \ rubygem-loofah>=2.2<3.0:textproc/rubygem-loofah \ rubygem-licensee8>=8.9<9.0:devel/rubygem-licensee8 \ rubygem-rack-attack44>=4.4.1<4.5.0:www/rubygem-rack-attack44 \ rubygem-ace-rails-ap>=4.1.0<4.2.0:www/rubygem-ace-rails-ap \ rubygem-charlock_holmes>=0.7.5<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-chronic>=0.10.2<0.11.0:devel/rubygem-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.1<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-webpack-rails-rails52>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails52 \ rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails52>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails52 \ rubygem-uglifier27>=2.7.2<2.8.0:www/rubygem-uglifier27 \ rubygem-addressable25>=2.5.2<2.6.0:www/rubygem-addressable25 \ rubygem-font-awesome-rails-rails52>=4.7<5.0:devel/rubygem-font-awesome-rails-rails52 \ rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \ rubygem-gon-rails52>=6.2<7.0:www/rubygem-gon-rails52 \ rubygem-request_store>=1.3<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \ rubygem-sentry-raven>=2.9<3.0:devel/rubygem-sentry-raven \ rubygem-premailer-rails19-rails52>=1.9.7<1.10.0:mail/rubygem-premailer-rails19-rails52 \ rubygem-gitlab-labkit>=0.5<1.0:devel/rubygem-gitlab-labkit \ rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails52>=5.1<6.0:devel/rubygem-rails-i18n-rails52 \ rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \ rubygem-gettext_i18n_rails_js-rails52>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails52 \ rubygem-gettext>=3.2.2<3.3.0:devel/rubygem-gettext \ rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \ rubygem-gitlab-peek-rails52>=0.0.1<0.1.0:devel/rubygem-gitlab-peek-rails52 \ rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \ rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \ rubygem-method_source>=0.8<1.0:devel/rubygem-method_source \ rubygem-influxdb>=0.2<1.0:databases/rubygem-influxdb \ rubygem-prometheus-client-mmap>=0.9.10<0.10.0:devel/rubygem-prometheus-client-mmap \ rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \ rubygem-octokit>=4.9<5.0:net/rubygem-octokit \ rubygem-mail_room>=0.9.1<0.10.0:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof>=1.0.0<1.1.0:devel/rubygem-ruby-prof \ rubygem-rbtrace>=0.4<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=0.9<1.0:devel/rubygem-memory_profiler \ rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=1.4<2.0:net/rubygem-oauth2 \ rubygem-health_check26-rails52>=2.6.0<2.7.0:devel/rubygem-health_check26-rails52 \ rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6<1.2.0:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-net-ssh>=5.2<6.0,2:security/rubygem-net-ssh \ rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly>=1.58.0<1.59.0:net/rubygem-gitaly \ + rubygem-gitaly>=1.65.0<1.66:net/rubygem-gitaly \ rubygem-grpc>=1.19.0<1.20.0:net/rubygem-grpc \ rubygem-google-protobuf371>=3.7.1<3.8.0:devel/rubygem-google-protobuf371 \ rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \ rubygem-flipper013>=0.13.0<0.14.0:devel/rubygem-flipper013 \ rubygem-flipper-active_record013>=0.13.0<0.14.0:databases/rubygem-flipper-active_record013 \ rubygem-flipper-active_support_cache_store013>=0.13.0<0.14.0:devel/rubygem-flipper-active_support_cache_store013 \ rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \ rubygem-lograge-rails52>=0.5<1.0:www/rubygem-lograge-rails52 \ rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \ - rubygem-net-dns>=0.9.0<0.10.0:dns/rubygem-net-dns \ + rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \ rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} CONFLICTS_INSTALL= gitolite-* \ gitolite2-* \ gogs-* \ gitea-* \ ${PYTHON_PKGNAMEPREFIX}-gitosis-* USE_RUBY= yes USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= ab531f31825d8d5aedce12d9975ecaa3e2720417 +GL_COMMIT= 1425a56c75beecaa289ad59587d636f8f469509e USERS= git GROUPS= git -NO_ARCH= yes NO_BUILD= yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/config/unicorn.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample ${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}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) .include Index: head/www/gitlab-ce/distinfo =================================================================== --- head/www/gitlab-ce/distinfo (revision 515491) +++ head/www/gitlab-ce/distinfo (revision 515492) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570175752 -SHA256 (gitlab-org-gitlab-foss-ab531f31825d8d5aedce12d9975ecaa3e2720417_GL0.tar.gz) = c6080cd14ba403f34d7861346d72a88eefd1625c28b5aa736fa503d91e12acce -SIZE (gitlab-org-gitlab-foss-ab531f31825d8d5aedce12d9975ecaa3e2720417_GL0.tar.gz) = 74638773 +TIMESTAMP = 1571860432 +SHA256 (gitlab-org-gitlab-foss-1425a56c75beecaa289ad59587d636f8f469509e_GL0.tar.gz) = 6e5007c68af005794b4ba6cebefcf08e284568bc93cc4384572d6f3a35ec690d +SIZE (gitlab-org-gitlab-foss-1425a56c75beecaa289ad59587d636f8f469509e_GL0.tar.gz) = 100104540 Index: head/www/gitlab-ce/files/patch-Gemfile =================================================================== --- head/www/gitlab-ce/files/patch-Gemfile (revision 515491) +++ head/www/gitlab-ce/files/patch-Gemfile (revision 515492) @@ -1,105 +1,114 @@ ---- Gemfile.orig 2019-09-24 12:11:44 UTC +--- Gemfile.orig 2019-10-22 12:01:49 UTC +++ Gemfile @@ -92,7 +92,6 @@ gem 'graphql', '~> 1.9.11' - # https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 + # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' +@@ -148,7 +147,7 @@ gem 'wikicloth', '0.8.1' + gem 'asciidoctor', '~> 2.0.10' + gem 'asciidoctor-include-ext', '~> 0.3.1', require: false + gem 'asciidoctor-plantuml', '0.0.9' +-gem 'rouge', '~> 3.11.0' ++gem 'rouge', '~> 3.11' + gem 'truncato', '~> 0.7.11' + gem 'bootstrap_form', '~> 4.2.0' + gem 'nokogiri', '~> 1.10.4' @@ -225,7 +224,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration -gem 'hipchat', '~> 1.5.0' +gem 'hipchat', '~> 1.6.0' # Jira integration gem 'jira-ruby', '~> 1.7' @@ -328,85 +327,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.9.10' gem 'raindrops', '~> 0.18' -end - -group :development do - gem 'foreman', '~> 0.84.0' - gem 'brakeman', '~> 4.2', require: false - gem 'danger', '~> 6.0', require: false - - gem 'letter_opener_web', '~> 1.3.4' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - # Better errors handler - gem 'better_errors', '~> 2.5.0' - gem 'binding_of_caller', '~> 0.8.0' - - # thin instead webrick - gem 'thin', '~> 1.7.0' -end - -group :development, :test do - gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - - gem 'awesome_print', require: false - gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.7.0' -- gem 'factory_bot_rails', '~> 4.8.2' +- gem 'factory_bot_rails', '~> 5.1.0' - gem 'rspec-rails', '~> 3.8.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized', require: false - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' - - # Generate Fake data - gem 'ffaker', '~> 2.10' - - gem 'capybara', '~> 3.22.0' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.141' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - - gem 'gitlab-styles', '~> 2.7', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.69.0' - gem 'rubocop-performance', '~> 1.1.0' - gem 'rubocop-rspec', '~> 1.22.1' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.31.0', require: false - gem 'simplecov', '~> 0.16.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 5.4', require: false - gem 'knapsack', '~> 1.17' - - 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 - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 3.5.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 0.2.5' +- gem 'test-prof', '~> 0.10.0' - gem 'rspec_junit_formatter' end gem 'octokit', '~> 4.9' Index: head/www/gitlab-ce/files/patch-config_gitlab.yml.example =================================================================== --- head/www/gitlab-ce/files/patch-config_gitlab.yml.example (revision 515491) +++ head/www/gitlab-ce/files/patch-config_gitlab.yml.example (revision 515492) @@ -1,56 +1,47 @@ ---- config/gitlab.yml.example.orig 2019-09-24 12:11:44 UTC +--- config/gitlab.yml.example.orig 2019-10-22 12:01:49 UTC +++ config/gitlab.yml.example -@@ -320,7 +320,7 @@ production: &base - # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages - # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages - admin: -- address: unix:/home/git/gitlab/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) -+ address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/pages-admin.socket # TCP connections are supported too (e.g. tcp://host:port) - # File that contains the shared secret key for verifying access for gitlab-pages. - # Default is '.gitlab_pages_shared_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_pages_shared_secret -@@ -895,7 +895,7 @@ production: &base +@@ -894,7 +894,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. - client_path: /home/git/gitaly/bin + client_path: %%PREFIX%%/share/gitaly/bin # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -913,8 +913,8 @@ production: &base +@@ -912,8 +912,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: - path: /home/git/repositories/ - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + path: /usr/local/git/repositories/ + gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -960,12 +960,12 @@ production: &base +@@ -959,12 +959,12 @@ production: &base ## GitLab Shell settings gitlab_shell: - path: /home/git/gitlab-shell/ - authorized_keys_file: /home/git/.ssh/authorized_keys + path: %%PREFIX%%/share/gitlab-shell/ + authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_shell_secret + # secret_file: /usr/local/www/gitlab-ce/.gitlab_shell_secret # Git over HTTP upload_pack: true -@@ -990,7 +990,7 @@ production: &base +@@ -989,7 +989,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git + bin_path: %%PREFIX%%/bin/git ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running Index: head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb =================================================================== --- head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb (revision 515491) +++ head/www/gitlab-ce/files/patch-config_initializers_1__settings.rb (revision 515492) @@ -1,17 +1,17 @@ ---- config/initializers/1_settings.rb.orig 2019-07-26 17:57:42 UTC +--- config/initializers/1_settings.rb.orig 2019-10-22 12:01:49 UTC +++ config/initializers/1_settings.rb -@@ -174,12 +174,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA +@@ -178,12 +178,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' -Settings.gitlab['user_home'] ||= begin - Etc.getpwnam(Settings.gitlab['user']).dir -rescue ArgumentError # no user configured - '/home/' + Settings.gitlab['user'] -end -Settings.gitlab['time_zone'] ||= nil +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['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'], []) Index: head/www/gitlab-ce/pkg-message =================================================================== --- head/www/gitlab-ce/pkg-message (revision 515491) +++ head/www/gitlab-ce/pkg-message (revision 515492) @@ -1,33 +1,33 @@ [ { message: <