diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index d8cdc97b470c..16059ade4815 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,423 +1,420 @@ PORTNAME= gitlab-ce -PORTVERSION= 15.1.4 -PORTREVISION= 3 +PORTVERSION= 15.2.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! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=3.0.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.1.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=3.0.1:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=15.2.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ - gitlab-pages>=1.59.1:www/gitlab-pages \ - gitlab-shell>=14.7.4:devel/gitlab-shell \ + gitlab-pages>=1.61.0:www/gitlab-pages \ + gitlab-shell>=14.9.4:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.6.0<6.1.7:www/rubygem-rails61 \ rubygem-bootsnap112>=1.12.0<1.13:devel/rubygem-bootsnap112 \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-view_component-rails61>=2.50.0<2.51:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ rubygem-pg13>=1.3.5<1.4:databases/rubygem-pg13 \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.0<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ - rubygem-devise47-rails61>=4.7.2<4.8:devel/rubygem-devise47-rails61 \ + rubygem-devise-rails61>=4.7.2<4.9:devel/rubygem-devise-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.13.0<1.14:security/rubygem-ruby-saml \ - rubygem-omniauth1>=1.9.1<2.0:security/rubygem-omniauth1 \ - rubygem-omniauth-auth0>=2.0.0<2.1.0:net/rubygem-omniauth-auth0 \ + rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \ + rubygem-omniauth-auth0>=3.0.0<3.1.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=1.0<2: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-cas3-oauth2>=1.1.4<1.2.0:security/rubygem-omniauth-cas3-oauth2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ rubygem-omniauth-alicloud>=1.0.1<1.1:security/rubygem-omniauth-alicloud \ - 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-facebook>=4.0.0:net/rubygem-omniauth-facebook \ + rubygem-omniauth-github>=1.4.0<3.0:net/rubygem-omniauth-github \ rubygem-omniauth-google-oauth2>=0.6.0<0.7.0:net/rubygem-omniauth-google-oauth2 \ 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-saml>=1.10<3.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.9.1<0.10.0:net/rubygem-gitlab-omniauth-openid-connect \ + rubygem-gitlab-omniauth-openid-connect>=0.9.1<0.11.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.19.0<1.20.0:security/rubygem-rack-oauth2 \ - rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \ + rubygem-jwt>=2.1.0<3:www/rubygem-jwt \ 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-rails61>=4.0.2<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-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<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-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \ rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \ rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \ rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \ - rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ + rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \ rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \ rubygem-hashie>=4.1.0:devel/rubygem-hashie \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ 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_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ rubygem-fog-aws>=3.14<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.15<2: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-gitlab-fog-azure-rm>=1.3.0<1.4: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-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ - rubygem-aws-sdk-core>=3<4:devel/rubygem-aws-sdk-core \ + rubygem-aws-sdk-core>=3.131.0<3.132: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-aws-sdk-s3>=1.114.0<1.115:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ 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.8.0<1.9.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ rubygem-commonmarker>=0.23.4<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \ 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.15<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge329>=3.29.0<3.30:textproc/rubygem-rouge329 \ 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.13.6<1.14: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-rack223>=2.2.3.0<2.2.4:www/rubygem-rack223 \ + rubygem-rack>=2.2.4<2.3,3:www/rubygem-rack \ rubygem-rack-timeout>=0.6.0<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.2<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq64>=6.4<6.5:devel/rubygem-sidekiq64 \ rubygem-sidekiq-cron-sidekiq64>=1.2<2.0:devel/rubygem-sidekiq-cron-sidekiq64 \ rubygem-redis-namespace>=1.8.1<1.9.0:databases/rubygem-redis-namespace \ rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ - rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ + rubygem-fugit>=1.2.1<2:devel/rubygem-fugit \ rubygem-httparty>=0.16.4<1:www/rubygem-httparty \ rubygem-rainbow>=3.1.1<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.4.0<1.5.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis44>=4.4.0<4.5:databases/rubygem-redis44 \ + rubygem-redis>=4.4.0<5:databases/rubygem-redis \ rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack52-rails61>=5.2.0<5.3:databases/rubygem-redis-actionpack52-rails61 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \ 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-asana>=0.10.13<0.11:www/rubygem-asana \ rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \ rubygem-kubeclient>=4.9.2<4.10.0:www/rubygem-kubeclient \ rubygem-sanitize>=6.0<7:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \ - rubygem-loofah>=2.16.0<3.0:textproc/rubygem-loofah \ + rubygem-loofah>=2.18.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.5.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-proxy>=0.7.2<0.8.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \ rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \ rubygem-terser>=1.0.2:textproc/rubygem-terser \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-tanuki_emoji>=0.6<1:graphics/rubygem-tanuki_emoji \ rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \ rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.1.0<2.2:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.6.0<6.7:www/rubygem-rack-attack \ rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=2.1.3<2.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ rubygem-gitlab-labkit>=0.23.0<0.24: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-rails61>=6.0<7.0:devel/rubygem-rails-i18n-rails61 \ + rubygem-rails-i18n-rails61>=7.0<8: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-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-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \ rubygem-snowplow-tracker>=0.6.1<1: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.15.0<0.16.0:devel/rubygem-prometheus-client-mmap \ - rubygem-warning>=1.2.0<1.3:devel/rubygem-warning \ + rubygem-prometheus-client-mmap>=0.16.0<0.17.0:devel/rubygem-prometheus-client-mmap \ + rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder \ - rubygem-gitlab-dangerfiles>=3.4.0<3.5:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.4.3<3.5:devel/rubygem-gitlab-dangerfiles \ 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-oauth21>=1.4.7<2.0:net/rubygem-oauth21 \ + rubygem-oauth2>=2.0<3: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.4.3<1.5:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ rubygem-gitaly>=15.1.0.pre.rc1<15.2.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ rubygem-google-protobuf319>=3.19.4<3.20:devel/rubygem-google-protobuf319 \ rubygem-toml-rb>=2.0.1<3:www/rubygem-toml-rb \ rubygem-flipper021>=0.21.0<0.22:devel/rubygem-flipper021 \ 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>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ rubygem-grape_logging>=1.8<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-json25>=2.5.1<2.6:devel/rubygem-json25 \ + rubygem-json>=2.5.1<3:devel/rubygem-json \ rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \ - rubygem-oj310>=3.10.6<3.11:devel/rubygem-oj310 \ + rubygem-oj>=3.13.16<3.14:devel/rubygem-oj \ 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 \ - rubygem-ipynbdiff>=0.4.7<0.4.8:devel/rubygem-ipynbdiff \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-parser>=0:devel/rubygem-parser BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} CONFLICTS_INSTALL= gitolite \ gitolite2 \ gogs \ gitea \ 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= 39245e886b4dbeac096a3ee649464f293627ff77 +GL_COMMIT= a876afc5fd85a4ccae6947941884f3913f472ab0 USERS= git GROUPS= git NO_BUILD= yes NO_ARCH= yes OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT= KERBEROS KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.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 ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example # 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/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/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.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}/tmp/sockets/private/internal ${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}) post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \ /db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST} @${ECHO_CMD} "@owner git" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} + #@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .include diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 3434b41389cf..d7b678883391 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659071358 -SHA256 (gitlab-org-gitlab-foss-39245e886b4dbeac096a3ee649464f293627ff77_GL0.tar.gz) = 635ff1aaf0e56dc13ee35f2e0c17581ae9164802186fa338fbe3cbc26646eafe -SIZE (gitlab-org-gitlab-foss-39245e886b4dbeac096a3ee649464f293627ff77_GL0.tar.gz) = 103097080 +TIMESTAMP = 1658815292 +SHA256 (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 281c61ce7279e5d8bd9afd2e28e1cdab944b7e2d3383b545e03b8480f9bdaf07 +SIZE (gitlab-org-gitlab-foss-a876afc5fd85a4ccae6947941884f3913f472ab0_GL0.tar.gz) = 101269547 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index bd6b8e3b25d1..2e93bf1200e2 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,161 +1,225 @@ ---- Gemfile.orig 2022-06-21 10:16:23 UTC +--- Gemfile.orig 2022-08-01 14:56:36 UTC +++ Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.7' +gem 'rails', '~> 6.1.4' gem 'bootsnap', '~> 1.12.0', require: false -@@ -92,7 +92,7 @@ gem 'gpgme', '~> 2.0.19' +@@ -29,35 +29,35 @@ gem 'marginalia', '~> 1.10.0' + gem 'declarative_policy', '~> 1.1.0' + + # Authentication libraries +-gem 'devise', '~> 4.7.2' ++gem 'devise', '~> 4.7' + gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-encryptable' + gem 'bcrypt', '~> 3.1', '>= 3.1.14' + gem 'doorkeeper', '~> 5.5.0.rc2' + gem 'doorkeeper-openid_connect', '~> 1.7.5' + gem 'rexml', '~> 3.2.5' + gem 'ruby-saml', '~> 1.13.0' +-gem 'omniauth', '~> 1.8' +-gem 'omniauth-auth0', '~> 2.0.0' ++gem 'omniauth', '>= 1.8' ++gem 'omniauth-auth0', '~> 3.0.0' + gem 'omniauth-azure-activedirectory-v2', '~> 1.0' + gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version + gem 'omniauth-cas3', '~> 1.1.4' + gem 'omniauth-dingtalk-oauth2', '~> 1.0' + gem 'omniauth-alicloud', '~> 1.0.1' +-gem 'omniauth-facebook', '~> 4.0.0' +-gem 'omniauth-github', '~> 1.4' ++gem 'omniauth-facebook', '>= 4.0.0' ++gem 'omniauth-github', '>= 1.4' + gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md + gem 'omniauth-google-oauth2', '~> 0.6.0' + gem 'omniauth-oauth2-generic', '~> 0.2.2' +-gem 'omniauth-saml', '~> 1.10' ++gem 'omniauth-saml', '~> 2.1.0' + gem 'omniauth-shibboleth', '~> 1.3.0' + gem 'omniauth-twitter', '~> 1.4' + gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md + gem 'omniauth-authentiq', '~> 0.3.3' +-gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' ++gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect' + gem 'omniauth-salesforce', '~> 1.0.5' + gem 'omniauth-atlassian-oauth2', '~> 0.2.0' + gem 'rack-oauth2', '~> 1.19.0' +-gem 'jwt', '~> 2.1.0' ++gem 'jwt', '~> 2.1' + + # Kerberos authentication. EE-only + gem 'gssapi', group: :kerberos +@@ -93,7 +93,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 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.16.3' +gem 'net-ldap', '~> 0.16' # API gem 'grape', '~> 1.5.2' -@@ -207,7 +207,7 @@ gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidek - gem 'fugit', '~> 1.2.1' +@@ -205,10 +205,10 @@ gem 'redis-namespace', '~> 1.8.1' + gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch' + + # Cron Parser +-gem 'fugit', '~> 1.2.1' ++gem 'fugit', '~> 1.2' # HTTP requests -gem 'httparty', '~> 0.16.4' +gem 'httparty', '~> 0.16' # Colored output to console gem 'rainbow', '~> 3.0' -@@ -334,89 +334,19 @@ gem 'batch-loader', '~> 2.0.1' +@@ -233,7 +233,7 @@ gem 'js_regex', '~> 3.7' + gem 'device_detector' + + # Redis +-gem 'redis', '~> 4.4.0' ++gem 'redis', '~> 4.4' + gem 'connection_pool', '~> 2.0' + + # Redis session store +@@ -335,89 +335,19 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking -gem 'snowplow-tracker', '~> 0.6.1' +gem 'snowplow-tracker', '~> 0.6' # Metrics gem 'method_source', '~> 1.0', require: false -gem 'webrick', '~> 1.6.1', require: false +gem 'webrick', '~> 1.6', require: false - gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' + gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' - gem 'warning', '~> 1.2.0' + gem 'warning', '~> 1.3.0' -group :development do -- gem 'lefthook', '~> 0.8.0', require: false +- gem 'lefthook', '~> 1.0.0', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.44.3', require: false - - gem 'letter_opener_web', '~> 2.0.0' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' - - # thin instead webrick - gem 'thin', '~> 1.8.0' - - gem 'sprite-factory', '~> 1.7' -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.5.0' - - gem 'awesome_print', require: false - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 6.2.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', '~> 7.1.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.6', require: false - - gem 'timecop', '~> 0.9.1' - - gem 'png_quantizator', '~> 0.2.1', require: false - - gem 'parallel', '~> 1.19', require: false - - gem 'test_file_finder', '~> 0.1.3' - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' - - gem 'pact', '~> 1.12' -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.4.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.3', require: false end -group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false - gem 'undercover', '~> 0.4.4', require: false -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -@@ -425,30 +355,6 @@ group :development, :test, :omnibus do +@@ -426,30 +356,6 @@ group :development, :test, :omnibus do gem 'gitlab-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-benchmark', '~> 0.6.0' - 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 'shoulda-matchers', '~> 5.1.0', 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', '~> 1.0.7' - 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' # Updating this gem version here is deprecated. See: -@@ -547,5 +453,8 @@ gem 'ipaddress', '~> 0.8.3' - gem 'parslet', '~> 1.8' - - gem 'ipynbdiff', '0.4.7' +@@ -534,7 +440,7 @@ gem 'lockbox', '~> 0.6.2' + gem 'valid_email', '~> 0.1' + + # JSON +-gem 'json', '~> 2.5.1' ++gem 'json', '~> 2.5' + gem 'json_schemer', '~> 0.2.18' + gem 'oj', '~> 3.13.19' + gem 'multi_json', '~> 1.14.1' +@@ -554,3 +460,6 @@ gem 'ed25519', '~> 1.3.0' + # Error Tracking OpenAPI client + # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature + gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' + +gem 'parser' + - - gem 'ed25519', '~> 1.3.0' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index f4da8a7cd063..a99623890fb9 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,107 +1,110 @@ ---- config/gitlab.yml.example.orig 2022-05-20 13:56:26 UTC +--- config/gitlab.yml.example.orig 2022-07-21 14:01:52 UTC +++ config/gitlab.yml.example -@@ -1160,14 +1160,14 @@ production: &base +@@ -1158,14 +1158,14 @@ 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) # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) + gitaly_backup_path: %%PREFIX%%/share/gitaly/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1202,12 +1202,12 @@ production: &base +@@ -1200,12 +1200,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 -@@ -1222,13 +1222,13 @@ production: &base +@@ -1220,13 +1220,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 -@@ -1241,13 +1241,13 @@ production: &base +@@ -1239,13 +1239,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 -@@ -1268,15 +1268,15 @@ production: &base +@@ -1266,18 +1266,18 @@ production: &base - # Sidekiq exporter is webserver built in to Sidekiq to expose Prometheus metrics + # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: - # enabled: true - # log_enabled: false - # address: localhost - # port: 8082 + enabled: true + log_enabled: false + address: localhost + port: 8082 + # tls_enabled: false + # tls_cert_path: /path/to/cert.pem + # tls_key_path: /path/to/key.pem sidekiq_health_checks: - # enabled: true - # address: localhost - # port: 8092 + enabled: true + address: localhost + port: 8092 - # Web exporter is a dedicated Rack server running alongside Puma to expose Prometheus metrics - # It runs alongside the `/metrics` endpoints to ease the publish of metrics -@@ -1496,13 +1496,13 @@ test: + # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. + web_exporter: +@@ -1502,13 +1502,13 @@ 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 backup: path: tmp/tests/backups - gitaly_backup_path: tmp/tests/gitaly/_build/bin/gitaly-backup + gitaly_backup_path: %%PREFIX%%/share/gitaly/bin/gitaly-backup gitlab_shell: path: tmp/tests/gitlab-shell/ authorized_keys_file: tmp/tests/authorized_keys diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec new file mode 100644 index 000000000000..9001645e1a55 --- /dev/null +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth-gitlab_omniauth-gitlab.gemspec @@ -0,0 +1,13 @@ +--- vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec.orig 2022-08-12 14:45:36 UTC ++++ vendor/gems/omniauth-gitlab/omniauth-gitlab.gemspec +@@ -16,8 +16,8 @@ Gem::Specification.new do |gem| + gem.test_files = Dir['spec/**/*.rb'] + gem.require_paths = ['lib'] + +- gem.add_dependency 'omniauth', '~> 1.0' +- gem.add_dependency 'omniauth-oauth2', '~> 1.7.1' ++ gem.add_dependency 'omniauth', '~> 2.0' ++ gem.add_dependency 'omniauth-oauth2', '~> 1.7' + gem.add_development_dependency 'rspec', '~> 3.1' + gem.add_development_dependency 'rspec-its', '~> 1.0' + gem.add_development_dependency 'simplecov' diff --git a/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec b/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec new file mode 100644 index 000000000000..106296200a90 --- /dev/null +++ b/www/gitlab-ce/files/patch-vendor_gems_omniauth__crowd_omniauth__crowd.gemspec @@ -0,0 +1,11 @@ +--- vendor/gems/omniauth_crowd/omniauth_crowd.gemspec.orig 2022-08-12 14:59:10 UTC ++++ vendor/gems/omniauth_crowd/omniauth_crowd.gemspec +@@ -15,7 +15,7 @@ Gem::Specification.new do |gem| + gem.require_paths = ["lib"] + gem.version = OmniAuth::Crowd::VERSION + +- gem.add_runtime_dependency 'omniauth', '~> 1.0', '< 3' ++ gem.add_runtime_dependency 'omniauth', '>= 1.0', '< 3' + gem.add_runtime_dependency 'nokogiri', '>= 1.4.4' + gem.add_runtime_dependency 'activesupport', '>= 0' + gem.add_development_dependency(%q, [">= 0"]) diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index 2d4413e0ed76..104e066ed222 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -1,33 +1,33 @@ [ { message: <