diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 1e535b360c20..4750022e6f5a 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,334 +1,330 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 13.12.2 -PORTREVISION= 1 +PORTVERSION= 14.0.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.31.0:devel/git \ +MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-agent>=13.12.0:net/gitlab-agent \ - gitlab-elasticsearch-indexer>=2.11.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-pages>=1.39.0:www/gitlab-pages \ - gitlab-shell>=13.18.0:devel/gitlab-shell \ + gitlab-agent>=14.0.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=2.12.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-pages>=1.40.0:www/gitlab-pages \ + gitlab-shell>=13.19.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.12:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-rails60>=6.0.3.6<6.0.4:www/rubygem-rails60 \ + rubygem-rails61>=6.1.3.2<6.1.4:www/rubygem-rails61 \ rubygem-bootsnap14>=1.4.6<2.0:devel/rubygem-bootsnap14 \ - rubygem-responders-rails60>=3.0<4.0:www/rubygem-responders-rails60 \ + rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg>=1.2.3<2:databases/rubygem-pg \ rubygem-rugged>=1.1<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.6.3<1.7:devel/rubygem-grape-path-helpers \ rubygem-faraday>=1.0<2:www/rubygem-faraday \ rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.0.0<1.1:security/rubygem-declarative_policy \ - rubygem-devise47-rails60>=4.7.2<4.8:devel/rubygem-devise47-rails60 \ + rubygem-devise47-rails61>=4.7.2<4.8:devel/rubygem-devise47-rails61 \ rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.7.5<1.8:security/rubygem-doorkeeper-openid_connect \ rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \ rubygem-ruby-saml>=1.12.1<1.13:security/rubygem-ruby-saml \ 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-activedirectory-v2>=0.1<1:net/rubygem-omniauth-azure-activedirectory-v2 \ 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.4.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_crowd>=2.4.0<2.5:devel/rubygem-omniauth_crowd \ rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \ rubygem-gitlab-omniauth-openid-connect>=0.4.0<0.5.0:net/rubygem-gitlab-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-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2>=1.16.0<1.17.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>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=1.1.0<1.2.0:graphics/rubygem-invisible_captcha \ - rubygem-devise-two-factor-rails60>=4.0.0<4.1:security/rubygem-devise-two-factor-rails60 \ + rubygem-devise-two-factor-rails61>=4.0.0<4.1:security/rubygem-devise-two-factor-rails61 \ 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.11<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip20>=2.0.0<2.1.0:archivers/rubygem-rubyzip20 \ rubygem-acme-client>=2.0.6<3:security/rubygem-acme-client \ rubygem-browser>=4.2<5.0:www/rubygem-browser \ rubygem-ohai>=16.10<17:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.20<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.16.3:net/rubygem-net-ldap \ rubygem-grape>=1.5.2<1.6:devel/rubygem-grape \ rubygem-grape-entity>=0.9.0<0.10.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ rubygem-graphql>=1.11.8<1.12:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.0.2<2.1:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ rubygem-graphlient>=0.4.0<0.5:devel/rubygem-graphlient \ rubygem-hashie>0:devel/rubygem-hashie \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ - rubygem-kaminari-rails60>=1.2.1<2.0:www/rubygem-kaminari-rails60 \ + rubygem-kaminari-rails61>=1.2.1<2.0:www/rubygem-kaminari-rails61 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \ rubygem-fog-aws>=3.9<4.0:net/rubygem-fog-aws \ rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \ rubygem-gitlab-fog-google>=1.13<2:net/rubygem-gitlab-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-gitlab-fog-azure-rm>=1.0.1<2:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=1.1.1<1.2:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-api-client>=0.33<1: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-model6>=6.1.1<7:textproc/rubygem-elasticsearch-model6 \ rubygem-elasticsearch-rails6>=6.1.1<7:textproc/rubygem-elasticsearch-rails6 \ rubygem-elasticsearch-api6>=6.8.2<6.9:textproc/rubygem-elasticsearch-api6 \ rubygem-aws-sdk-core>=3<4:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ rubygem-aws-sdk-s3>=1<2:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-html-pipeline>=2.13.2<2.14:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list=2.3.1:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.1<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.21<1.0:textproc/rubygem-commonmarker \ rubygem-kramdown>=2.3.1<2.4:textproc/rubygem-kramdown \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.1.2<7: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.12<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.12<0.1:textproc/rubygem-asciidoctor-plantuml \ rubygem-asciidoctor-kroki>=0.4.0<0.5:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=3.26.0<3.27: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.11.3<1.12:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.3<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ rubygem-rack>=2.2.3<2.3,3:www/rubygem-rack \ rubygem-rack-timeout>=0.5.1<0.6:www/rubygem-rack-timeout \ - rubygem-unicorn>=5.5<6:www/rubygem-unicorn \ - rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \ - rubygem-puma>=5.1.1:www/rubygem-puma \ + rubygem-puma>=5.3.1<5.4:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=7.0<8.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq5>=5.2.9<5.3.0:devel/rubygem-sidekiq5 \ rubygem-sidekiq-cron>=1.0<2.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace17>=1.7.0<1.8.0:databases/rubygem-redis-namespace17 \ rubygem-gitlab-sidekiq-fetcher>=0.5.6<0.5.7: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>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ rubygem-re2>=1.2.0<1.3.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.4<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-rails60>=5.0.2<5.1:www/rubygem-redis-rails-rails60 \ + rubygem-redis-rails-rails61>=5.0.2<5.1:www/rubygem-redis-rails-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby>=2.1.4<2.2: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-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \ rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ rubygem-asana>=0.10.3<0.11:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \ rubygem-kubeclient>=4.9.1<4.10.0:www/rubygem-kubeclient \ rubygem-sanitize>=5.2.1<6:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \ rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.4<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy06>=0.6.0<0.7.0:www/rubygem-rack-proxy06 \ - rubygem-sassc-rails-rails60>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails60 \ + rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \ rubygem-autoprefixer-rails1020>=10.2.0.0<10.2.1:textproc/rubygem-autoprefixer-rails1020 \ rubygem-terser>=1.0.2:textproc/rubygem-terser \ rubygem-addressable>=2.7<3:www/rubygem-addressable \ rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \ - rubygem-gon-rails60>=6.4.0<6.5:www/rubygem-gon-rails60 \ + rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \ rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=1.5<2.0:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \ - rubygem-sentry-raven>=3.0<4.0:devel/rubygem-sentry-raven \ + rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ rubygem-pg_query>=2.0.3<2.1:databases/rubygem-pg_query \ - rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \ - rubygem-gitlab-labkit>=0.17.1<0.18:devel/rubygem-gitlab-labkit \ + rubygem-premailer-rails-rails61>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails61 \ + rubygem-gitlab-labkit>=0.18.0<0.19:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.14.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ - rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \ + rubygem-rails-i18n-rails61>=6.0<7.0:devel/rubygem-rails-i18n-rails61 \ rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \ - rubygem-gettext_i18n_rails_js-rails60>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails60 \ + rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \ rubygem-gettext>=3.3<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ - rubygem-peek-rails60>=1.1.0<2.0:devel/rubygem-peek-rails60 \ + rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \ rubygem-method_source>=1.0<2:devel/rubygem-method_source \ rubygem-webrick>=1.6.1:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=0.12.0<0.13.0:devel/rubygem-prometheus-client-mmap \ - rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-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.3.0<1.4.0:devel/rubygem-ruby-prof \ rubygem-stackprof>=0.2.15<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<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.4<2.0:net/rubygem-oauth2 \ rubygem-health_check>=3.0<4:devel/rubygem-health_check \ 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>=6.0<7,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-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=13.12.0.pre.rc1<13.13.0:net/rubygem-gitaly \ + rubygem-gitaly>=14.0.0.pre.rc2<14.1.0:net/rubygem-gitaly \ + rubygem-kas-grpc>=0.0.2<0.1:net/rubygem-kas-grpc \ rubygem-grpc>=1.30.2<2:net/rubygem-grpc \ - rubygem-google-protobuf315>=3.15.8<3.16:devel/rubygem-google-protobuf315 \ + rubygem-google-protobuf>=3.17.1<3.18:devel/rubygem-google-protobuf \ rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \ - rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \ - rubygem-flipper-active_record017>=0.17.1<0.18.0:databases/rubygem-flipper-active_record017 \ - rubygem-flipper-active_support_cache_store017>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store017 \ + rubygem-flipper>=0.21.0<0.22:devel/rubygem-flipper \ + rubygem-flipper-active_record-rails61>=0.21.0<0.22:databases/rubygem-flipper-active_record-rails61 \ + rubygem-flipper-active_support_cache_store-rails61>=0.21.0<0.22:devel/rubygem-flipper-active_support_cache_store-rails61 \ rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.5.4<0.6:devel/rubygem-gitlab-experiment \ - rubygem-lograge-rails60>=0.11.2<1.0:www/rubygem-lograge-rails60 \ + rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \ 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 \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-erubi19>=1.9.0<1.10:www/rubygem-erubi19 \ rubygem-mail>=2.7.1<2.7.2,2:mail/rubygem-mail \ rubygem-lockbox>=0.6.2<0.7:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-json>=2.3.0<2.4:devel/rubygem-json \ rubygem-json_schemer>=0.2.12<0.3:devel/rubygem-json_schemer \ rubygem-oj310>=3.10.6<3.11:devel/rubygem-oj310 \ rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ rubygem-yajl-ruby>=1.4.1<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} CONFLICTS_INSTALL= gitolite-* \ gitolite2-* \ gogs-* \ gitea-* \ ${PYTHON_PKGNAMEPREFIX}-gitosis-* USES= go:modules shebangfix 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?= d98457affdf684f129fd52388ac9e290e4d2924f +GL_COMMIT?= f1926d2aa6447173a06fee5e0a3141bea27a0d8d USERS= git GROUPS= git NO_BUILD= yes NO_ARCH= 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 # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${RM} -R ${WRKSRC}/workhorse ${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 # get files for workdir with: find . -name "*.example" ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/redis.cache.yml.example ${WRKSRC}/config/redis.cache.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/redis.queues.yml.example ${WRKSRC}/config/redis.queues.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample ${MV} ${WRKSRC}/config/redis.shared_state.yml.example ${WRKSRC}/config/redis.shared_state.yml.sample - ${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.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 ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) # Execute this target to automatically generate the correct pkg-plist makeplist: $(MAKE) clean patch ${RM} -R ${WRKSRC}/workhorse php scripts/create-plist.php ${WRKSRC} > pkg-plist $(MAKE) clean .include diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index b6413c16f1fb..aeedbb130f0e 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622581881 -SHA256 (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 249319c2535d0173d8040c0815f003c981706e2262cfe2c9a398138d343273c7 -SIZE (gitlab-org-gitlab-foss-d98457affdf684f129fd52388ac9e290e4d2924f_GL0.tar.gz) = 95973110 +TIMESTAMP = 1624340831 +SHA256 (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 2275f7d6bbe66189a2a7531a9feb435661a868a5cc05e002ca11df33ce942563 +SIZE (gitlab-org-gitlab-foss-f1926d2aa6447173a06fee5e0a3141bea27a0d8d_GL0.tar.gz) = 96810736 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index b4ba20c6961f..48a9feda0a84 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,147 +1,155 @@ ---- Gemfile.orig 2021-05-21 13:24:46 UTC +--- Gemfile.orig 2021-06-21 15:55:09 UTC +++ Gemfile @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.16' # API gem 'grape', '~> 1.5.2' @@ -102,7 +102,6 @@ gem 'graphql', '~> 1.11.8' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.2' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' @@ -157,7 +156,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.1.2' +gem 'rdoc', '~> 6.1' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -@@ -337,108 +336,13 @@ gem 'snowplow-tracker', '~> 0.6.1' +@@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1' + # and https://github.com/pganalyze/pg_query/pull/213 are + # released. gitlab-labkit will need to be updated to use the pg_query + # version. +-gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query' ++gem 'pg_query', '~> 2.0.3', require: 'pg_query' + + gem 'premailer-rails', '~> 1.10.3' + +@@ -337,107 +336,12 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics group :metrics do gem 'method_source', '~> 1.0', require: false - gem 'webrick', '~> 1.6.1', require: false + gem 'webrick', '~> 1.6', require: false # Prometheus gem 'prometheus-client-mmap', '~> 0.12.0' - gem 'raindrops', '~> 0.18' end -group :development do - gem 'lefthook', '~> 0.7.0', require: false -- gem 'solargraph', '~> 0.40.4', require: false +- gem 'solargraph', '~> 0.42', require: false - - gem 'letter_opener_web', '~> 1.4.0' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' - - # thin instead webrick - gem 'thin', '~> 1.8.0' -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 6.1.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.4.0' - - gem 'awesome_print', require: false - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.1.0' - gem 'rspec-rails', '~> 5.0.1' - - # 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 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - - gem 'gitlab-styles', '~> 6.2.0', require: false - - gem 'haml_lint', '~> 0.36.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'knapsack', '~> 1.21.1' - gem 'crystalball', '~> 0.7.0', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false - - gem 'timecop', '~> 0.9.1' - - gem 'png_quantizator', '~> 0.2.1', require: false - - gem 'parallel', '~> 1.19', require: false - - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - gem 'test_file_finder', '~> 0.1.3' -end - -group :development, :test, :danger do -- gem 'gitlab-dangerfiles', '~> 2.0.0', require: false +- gem 'gitlab-dangerfiles', '~> 2.1.2', require: false -end - -group :development, :test, :coverage do - gem 'simplecov', '~> 0.18.5', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false -end - -# Gems required in omnibus-gitlab pipeline -group :development, :test, :omnibus do - gem 'license_finder', '~> 6.0', require: false -end - -group :test do - gem 'fuubar', '~> 2.2.0' - gem 'rspec-retry', '~> 0.6.1' - gem 'rspec_profiling', '~> 0.0.6' - gem 'rspec-parameterized', require: false - - gem 'capybara', '~> 3.35.3' - gem 'capybara-screenshot', '~> 1.0.22' - gem 'selenium-webdriver', '~> 3.142' - - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 0.12.0' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false -end - gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -483,7 +387,7 @@ gem 'spamcheck', '~> 0.1.0' - # Gitaly GRPC protocol definitions - gem 'gitaly', '~> 13.12.0.pre.rc1' +@@ -485,7 +389,7 @@ gem 'gitaly', '~> 14.0.0.pre.rc2' + # KAS GRPC protocol definitions + gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.30' - gem 'google-protobuf', '~> 3.15.8' + gem 'google-protobuf', '~> 3.17.1' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 9a7bcfa31760..c776e15ee016 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,70 +1,70 @@ ---- config/gitlab.yml.example.orig 2021-05-19 15:44:42 UTC +--- config/gitlab.yml.example.orig 2021-06-21 15:55:09 UTC +++ config/gitlab.yml.example -@@ -1090,7 +1090,7 @@ production: &base - # Gitaly settings - gitaly: - # Path to the directory containing Gitaly client executables. -- client_path: /home/git/gitaly -+ 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. -@@ -1108,8 +1108,8 @@ production: &base +@@ -1109,8 +1109,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: %%PREFIX%%/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 -@@ -1155,12 +1155,12 @@ production: &base +@@ -1156,12 +1156,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: %%PREFIX%%/www/gitlab-ce/.gitlab_shell_secret # Git over HTTP upload_pack: true -@@ -1175,13 +1175,13 @@ production: &base +@@ -1176,13 +1176,13 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_workhorse_secret gitlab_kas: # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_kas_secret + # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_kas_secret # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1191,13 +1191,13 @@ production: &base +@@ -1192,13 +1192,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ + indexer_path: %%PREFIX%%/bin/ ## Git settings # 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 +@@ -1425,7 +1425,7 @@ test: + gitaly_address: unix:tmp/tests/gitaly/praefect.socket + + gitaly: +- client_path: tmp/tests/gitaly/_build/bin ++ client_path: %%PREFIX%%/share/gitaly/bin + token: secret + workhorse: + secret_file: tmp/gitlab_workhorse_test_secret diff --git a/www/gitlab-ce/files/patch-config_unicorn.rb.example b/www/gitlab-ce/files/patch-config_unicorn.rb.example deleted file mode 100644 index 27edbd754706..000000000000 --- a/www/gitlab-ce/files/patch-config_unicorn.rb.example +++ /dev/null @@ -1,45 +0,0 @@ ---- config/unicorn.rb.example.orig 2021-04-22 21:13:23 UTC -+++ config/unicorn.rb.example -@@ -33,12 +33,12 @@ worker_processes 3 - - # Help ensure your application will always spawn in the symlinked - # "current" directory that Capistrano sets up. --working_directory "/home/git/gitlab" # available in 0.94.0+ -+working_directory "%%PREFIX%%/www/gitlab-ce" # available in 0.94.0+ - - # Listen on both a Unix domain socket and a TCP port. - # If you are load-balancing multiple Unicorn masters, lower the backlog - # setting to e.g. 64 for faster failover. --listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024 -+listen "%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024 - listen "127.0.0.1:8080", :tcp_nopush => true - - # destroy workers after 30 seconds instead of 60 seconds (the default) -@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => true - timeout 60 - - # feel free to point this anywhere accessible on the filesystem --pid "/home/git/gitlab/tmp/pids/unicorn.pid" -+pid "%%PREFIX%%/www/gitlab-ce/tmp/pids/unicorn.pid" - - # By default, the Unicorn logger will write to stderr. - # Additionally, some applications/frameworks log to stderr or stdout, - # so prevent them from going to /dev/null when daemonized here: --stderr_path "/home/git/gitlab/log/unicorn.stderr.log" --stdout_path "/home/git/gitlab/log/unicorn.stdout.log" -+stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log" -+stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log" - - # Save memory by sharing the application code among multiple Unicorn workers - # with "preload_app true". See: -@@ -81,8 +81,8 @@ preload_app true - # fast LAN. - check_client_connection false - --require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events" --require_relative "/home/git/gitlab/lib/gitlab/log_timestamp_formatter.rb" -+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events" -+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/log_timestamp_formatter.rb" - - before_exec do |server| - # Signal application hooks that we're about to restart diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index a83e87413c5b..1965d0bff0b9 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -1,33 +1,33 @@ [ { message: <isFile()) continue; // skip unwanted files if(in_array($objFile->getExtension(), array('orig', 'bak', 'gitkeep', 'gitignore'))) continue; // skip lock file, it shoud be generated when GitLab is started if('Gemfile.lock' === $objFile->getFilename()) continue; // strip given dir - we just want the aim-dir $intEndPosOfDir = strpos($objFile->getRealPath(), $strGitLabDir) + strlen($strGitLabDir); $strFilePath = substr($objFile->getRealPath(), $intEndPosOfDir); // list of config files to ignore $arrConfigFiles = array('/config/database.yml.example', '/config/gitlab.yml.example', - '/config/unicorn.rb.example', '/config/puma.rb.example', '/config/resque.yml.example', '/config/secrets.yml.example', '/config/initializers/rack_attack.rb.example', '/config/cable.yml.example', '/config/initializers/devise_password_length.rb.example', '/config/redis.cache.yml.example', '/config/redis.queues.yml.example', '/config/redis.shared_state.yml.example', '/config/sidekiq.yml.example', '/lib/support/nginx/gitlab', '/lib/support/nginx/gitlab-ssl', '/config/secrets.yml' ); // skip config files if(in_array($strFilePath, $arrConfigFiles)) continue; $arrFiles[] = "%%WWWDIR%%$strFilePath"; } sort($arrFiles); // go through the files and print them foreach($arrFiles AS $strFile) { // if a file starts with /bin/ add executable rights if(is_int(strpos($strFile, '%%WWWDIR%%/bin/'))) { print "@(git,,544) $strFile\n"; // schema.rb needs git-owner, because its written on updates } elseif ($strFile === '%%WWWDIR%%/db/schema.rb') { print "@(git,,) $strFile\n"; // gitlab.po(t) files needs git-owner, because there were compiled on update/installation } elseif (fnmatch('*/gitlab.pot', $strFile) || fnmatch('*/gitlab.po', $strFile) || fnmatch('*/gitlab.po.time_stamp', $strFile)) { print "@(git,,) $strFile\n"; // also there is javascript compiled on update/install which is localiced } elseif (fnmatch('*/locale/*/app.js', $strFile) || fnmatch('*/locale/index.js', $strFile)) { print "@(git,,) $strFile\n"; // everything else is just fine } else { print "$strFile\n"; } } // at least print static block of dirs and config files print "@owner git @group www @dir(git,git) %%WWWDIR%%/ @dir %%WWWDIR%%/app/assets/images/auth_buttons/ @dir %%WWWDIR%%/app/assets/javascripts/locale/ @dir(git,git,554) %%WWWDIR%%/bin @dir %%WWWDIR%%/config @dir(,,700) %%WWWDIR%%/builds -@dir %%WWWDIR%%/changelogs/unreleased @dir(,,744) %%WWWDIR%%/locale @dir %%WWWDIR%%/lib/assets @dir(,,744) %%WWWDIR%%/locale/bg @dir(,,744) %%WWWDIR%%/locale/de @dir(,,744) %%WWWDIR%%/locale/eo @dir(,,744) %%WWWDIR%%/locale/es @dir(,,744) %%WWWDIR%%/locale/fil_PH @dir(,,744) %%WWWDIR%%/locale/fr @dir(,,744) %%WWWDIR%%/locale/id_ID @dir(,,744) %%WWWDIR%%/locale/it @dir(,,744) %%WWWDIR%%/locale/ja @dir(,,744) %%WWWDIR%%/locale/ko @dir(,,744) %%WWWDIR%%/locale/nl_NL @dir(,,744) %%WWWDIR%%/locale/pl_PL @dir(,,744) %%WWWDIR%%/locale/pt_BR @dir(,,744) %%WWWDIR%%/locale/ru @dir(,,744) %%WWWDIR%%/locale/tr_TR @dir(,,744) %%WWWDIR%%/locale/uk @dir(,,744) %%WWWDIR%%/locale/zh_CN @dir(,,744) %%WWWDIR%%/locale/zh_HK @dir(,,744) %%WWWDIR%%/locale/zh_TW @dir(,,744) %%WWWDIR%%/log -@dir(,,744) %%WWWDIR%%/plugins @dir %%WWWDIR%%/public @dir %%WWWDIR%%/public/assets @dir(,,700) %%WWWDIR%%/public/uploads @dir %%WWWDIR%%/qa/qa/specs/features/api/2_plan @dir %%WWWDIR%%/qa/qa/specs/features/api/4_verify @dir %%WWWDIR%%/qa/qa/specs/features/api/5_package @dir %%WWWDIR%%/qa/qa/specs/features/api/6_release @dir %%WWWDIR%%/qa/qa/specs/features/api/7_configure @dir %%WWWDIR%%/qa/qa/specs/features/api/8_monitor @dir %%WWWDIR%%/qa/qa/specs/features/browser_ui/5_package @dir %%WWWDIR%%/spec/support/gitlab-git-test.git/refs/heads @dir %%WWWDIR%%/spec/support/gitlab-git-test.git/refs/tags @dir(,,700) %%WWWDIR%%/shared @dir(,,700) %%WWWDIR%%/shared/artifacts @dir(,,700) %%WWWDIR%%/shared/artifacts/tmp @dir(,,700) %%WWWDIR%%/shared/artifacts/tmp/cache @dir(,,700) %%WWWDIR%%/shared/artifacts/tmp/uploads @dir(,,700) %%WWWDIR%%/shared/artifacts/tmp/work @dir(,,770) %%WWWDIR%%/shared/pages @dir(,,700) %%WWWDIR%%/shared/tmp @dir(,,700) %%WWWDIR%%/shared/lfs-objects @dir(,,700) %%WWWDIR%%/shared/registry @dir(,,700) %%WWWDIR%%/spec/javascripts/fixtures @dir(,,770) %%WWWDIR%%/tmp @dir(,,770) %%WWWDIR%%/tmp/backups @dir(,,770) %%WWWDIR%%/tmp/cache @dir(,,770) %%WWWDIR%%/tmp/feature_flags @dir(,,770) %%WWWDIR%%/tmp/pids @dir(,,770) %%WWWDIR%%/tmp/prometheus_multiproc_dir @dir(,,770) %%WWWDIR%%/tmp/prometheus_multiproc_dir/puma @dir(,,770) %%WWWDIR%%/tmp/prometheus_multiproc_dir/sidekiq @dir(,,770) %%WWWDIR%%/tmp/prometheus_multiproc_dir/unicorn @dir(,,770) %%WWWDIR%%/tmp/sessions @dir(,,770) %%WWWDIR%%/tmp/sockets @dir(,,770) %%WWWDIR%%/tmp/sockets/private @dir(,,770) %%WWWDIR%%/vendor @dir(,,770) %%WWWDIR%%/vendor/assets @dir(,,770) %%WWWDIR%%/vendor/assets/stylesheets @dir(,,770) %%WWWDIR%%/workhorse/changelogs/unreleased @sample %%WWWDIR%%/config/puma.rb.sample @sample(git,www,0600) %%WWWDIR%%/config/secrets.yml.sample @sample %%WWWDIR%%/config/redis.cache.yml.sample @sample %%WWWDIR%%/config/sidekiq.yml.sample @sample %%WWWDIR%%/config/cable.yml.sample @sample %%WWWDIR%%/config/gitlab.yml.sample @sample %%WWWDIR%%/config/redis.queues.yml.sample @sample %%WWWDIR%%/config/initializers/devise_password_length.rb.sample @sample %%WWWDIR%%/config/redis.shared_state.yml.sample -@sample %%WWWDIR%%/config/unicorn.rb.sample @sample %%WWWDIR%%/config/resque.yml.sample @sample %%WWWDIR%%/config/database.yml.sample @sample %%WWWDIR%%/lib/support/nginx/gitlab.sample @sample %%WWWDIR%%/lib/support/nginx/gitlab-ssl.sample"; print "\n";