Index: head/www/gitlab/Makefile =================================================================== --- head/www/gitlab/Makefile (revision 463764) +++ head/www/gitlab/Makefile (revision 463765) @@ -1,257 +1,257 @@ # Created by: Torsten Zuehlsdorff # $FreeBSD$ PORTNAME= gitlab PORTVERSION= 10.4.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= idefix@fechner.net COMMENT= Web GUI for managing git repositories LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_SINGLE= DATABASE OPTIONS_SINGLE_DATABASE= PGSQL MYSQL OPTIONS_DEFAULT= PGSQL PGSQL_DESC= Default PostgreSQL support (preferred) MYSQL_DESC= Optional MySQL support BUILD_DEPENDS= gem:devel/ruby-gems # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS # for the options RUN_DEPENDS= git>=2.14.3:devel/git \ gitlab-shell>=5.11.0:devel/gitlab-shell\ gitlab-workhorse>=3.3.1:www/gitlab-workhorse \ redis>=2.8.23:databases/redis \ npm>=4.3.0:www/npm \ yarn>=0.17.0:www/yarn \ rubygem-rails4>=4.2.8:www/rubygem-rails4 \ rubygem-rails-deprecated_sanitizer>=1.0.3:devel/rubygem-rails-deprecated_sanitizer \ rubygem-responders>=2.0:www/rubygem-responders \ rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \ rubygem-default_value_for>=3.0.1:devel/rubygem-default_value_for \ rubygem-rugged>=0.26.0:devel/rubygem-rugged \ rubygem-grape-route-helpers>=2.1.0:devel/rubygem-grape-route-helpers \ rubygem-faraday>=0.12.0:www/rubygem-faraday \ rubygem-devise>=4.2:devel/rubygem-devise \ rubygem-doorkeeper>=4.2:security/rubygem-doorkeeper \ rubygem-doorkeeper-openid_connect>=1.2.0:security/rubygem-doorkeeper-openid_connect \ rubygem-omniauth14>=1.4.2:security/rubygem-omniauth14 \ rubygem-omniauth-auth014>=1.4.1:net/rubygem-omniauth-auth014 \ rubygem-omniauth-azure-oauth2>=0.0.9:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4:security/rubygem-omniauth-cas3 \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github11>=1.1.1:net/rubygem-omniauth-github11 \ rubygem-omniauth-gitlab>=1.0.2:security/rubygem-omniauth-gitlab \ rubygem-omniauth-google-oauth2>=0.5.2:net/rubygem-omniauth-google-oauth2 \ rubygem-omniauth-kerberos>=0.3.0:net/rubygem-omniauth-kerberos \ rubygem-omniauth-oauth2-generic>=0.2.2:security/rubygem-omniauth-oauth2-generic \ rubygem-omniauth-saml17>=1.7.0:security/rubygem-omniauth-saml17 \ rubygem-omniauth-shibboleth12>=1.2.0:security/rubygem-omniauth-shibboleth12 \ rubygem-omniauth-twitter12>=1.2.0:net/rubygem-omniauth-twitter12 \ rubygem-omniauth_crowd22>=2.2.0:devel/rubygem-omniauth_crowd22 \ rubygem-omniauth-authentiq>=0.3.1:net/rubygem-omniauth-authentiq \ rubygem-rack-oauth212>=1.2.1:security/rubygem-rack-oauth212 \ rubygem-jwt1>=1.5.6:www/rubygem-jwt1 \ rubygem-recaptcha3>=3.0:devel/rubygem-recaptcha3 \ rubygem-akismet>=2.0:devel/rubygem-akismet \ rubygem-devise-two-factor>=3.0.0:security/rubygem-devise-two-factor \ rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \ rubygem-attr_encrypted30>=3.0.0:security/rubygem-attr_encrypted30 \ rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \ rubygem-validates_hostname>=1.0.6:dns/rubygem-validates_hostname \ rubygem-browser>=2.2:www/rubygem-browser \ rubygem-gpgme>=2.0.13:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.0.4:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap>=0.16.0:net/rubygem-net-ldap \ rubygem-gollum-lib-gitlab>=4.2.0:www/rubygem-gollum-lib-gitlab \ rubygem-gollum-rugged_adapter>=0.4.4:www/rubygem-gollum-rugged_adapter \ rubygem-github-linguist47>=4.7.0:textproc/rubygem-github-linguist47 \ rubygem-grape>=1.0:devel/rubygem-grape \ rubygem-grape-entity060>=0.6.0:devel/rubygem-grape-entity060 \ rubygem-rack-cors>=1.0.0:www/rubygem-rack-cors \ rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails4>=1.0:www/rubygem-kaminari-rails4 \ rubygem-hamlit26>=2.6.1:www/rubygem-hamlit26 \ rubygem-carrierwave>=1.1:www/rubygem-carrierwave \ rubygem-dropzonejs-rails07>=0.7.1:www/rubygem-dropzonejs-rails07 \ rubygem-fog-aws1>=1.4:net/rubygem-fog-aws1 \ rubygem-fog-core1>=1.44:devel/rubygem-fog-core1 \ rubygem-fog-google0>=0.5:net/rubygem-fog-google0 \ rubygem-fog-local>=0.3:net/rubygem-fog-local \ rubygem-fog-openstack>=0.1:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.2.0:net/rubygem-fog-aliyun \ rubygem-google-api-client>=0.13.6:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4:textproc/rubygem-unf \ rubygem-seed-fu236>=2.3.6:databases/rubygem-seed-fu236 \ rubygem-html-pipeline1>=1.11.0:textproc/rubygem-html-pipeline1 \ rubygem-deckar01-task_list>=2.0.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.6.2:textproc/rubygem-gitlab-markup \ rubygem-redcarpet>=3.4:textproc/rubygem-redcarpet \ rubygem-redcloth>=4.3.2:www/rubygem-redcloth \ rubygem-rdoc>=4.2:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=1.5.2:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-plantuml007>=0.0.7:textproc/rubygem-asciidoctor-plantuml007 \ rubygem-rouge2>=2.0:textproc/rubygem-rouge2 \ rubygem-truncato>=0.7.9:textproc/rubygem-truncato \ rubygem-bootstrap_form>=2.7.0:devel/rubygem-bootstrap_form \ rubygem-nokogiri>=1.8.1:textproc/rubygem-nokogiri \ rubygem-diffy31>=3.1.0:textproc/rubygem-diffy31 \ rubygem-unicorn51>=5.1.0:www/rubygem-unicorn51 \ rubygem-unicorn-worker-killer044>=0.4.4:www/rubygem-unicorn-worker-killer044 \ rubygem-state_machines-activerecord>=0.4.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=4.0.0:www/rubygem-acts-as-taggable-on \ rubygem-sidekiq>=5.0.0:devel/rubygem-sidekiq \ rubygem-sidekiq-cron>=0.6.0:devel/rubygem-sidekiq-cron \ rubygem-redis-namespace15>=1.5.2:databases/rubygem-redis-namespace15 \ rubygem-sidekiq-limit_fetch>=3.4:devel/rubygem-sidekiq-limit_fetch \ rubygem-rufus-scheduler>=3.4.0:devel/rubygem-rufus-scheduler \ rubygem-httparty>=0.13.3:www/rubygem-httparty \ rubygem-rainbow2>=2.2:devel/rubygem-rainbow2 \ rubygem-settingslogic>=2.0.9:devel/rubygem-settingslogic \ rubygem-re2>=1.1.1:devel/rubygem-re2 \ rubygem-version_sorter21>=2.1.0:textproc/rubygem-version_sorter21 \ rubygem-redis-rails>=5.0.1:www/rubygem-redis-rails \ rubygem-redis3>=3.2:databases/rubygem-redis3 \ rubygem-connection_pool>=2.0:net/rubygem-connection_pool \ rubygem-hipchat15>=1.5.0:net-im/rubygem-hipchat15 \ rubygem-jira-ruby>=1.4:devel/rubygem-jira-ruby \ rubygem-gitlab-flowdock-git-hook>=1.0.1:www/rubygem-gitlab-flowdock-git-hook \ rubygem-gemnasium-gitlab-service>=0.2:devel/rubygem-gemnasium-gitlab-service \ rubygem-slack-notifier1>=1.5.1:devel/rubygem-slack-notifier1 \ rubygem-asana>=0.6.0:www/rubygem-asana \ rubygem-ruby-fogbugz>=0.2.1:devel/rubygem-ruby-fogbugz \ rubygem-kubeclient22>=2.2.0:www/rubygem-kubeclient22 \ rubygem-d3_rails-rails4>=3.5.0:www/rubygem-d3_rails-rails4 \ rubygem-sanitize>=2.0:textproc/rubygem-sanitize \ rubygem-babosa>=1.0.2:textproc/rubygem-babosa \ rubygem-loofah20>=2.0.3:textproc/rubygem-loofah20 \ rubygem-licensee8>=8.7:devel/rubygem-licensee8 \ rubygem-rack-attack44>=4.4.1:www/rubygem-rack-attack44 \ rubygem-ace-rails-ap>=4.1.0:www/rubygem-ace-rails-ap \ rubygem-mousetrap-rails>=1.4.6:www/rubygem-mousetrap-rails \ rubygem-charlock_holmes>=0.7.5:textproc/rubygem-charlock_holmes \ rubygem-oj2>=2.17.4:devel/rubygem-oj2 \ rubygem-chronic>=0.10.2:devel/rubygem-chronic \ rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \ rubygem-webpack-rails>=0.9.10:www/rubygem-webpack-rails \ rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \ rubygem-sass-rails-rails4>=5.0.6:textproc/rubygem-sass-rails-rails4 \ rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \ rubygem-addressable>=2.5.2:www/rubygem-addressable \ rubygem-bootstrap-sass>=3.3.0:www/rubygem-bootstrap-sass \ rubygem-font-awesome-rails-rails4>=4.7:devel/rubygem-font-awesome-rails-rails4 \ rubygem-gemojione>=3.3:graphics/rubygem-gemojione \ rubygem-gon61>=6.1.0:www/rubygem-gon61 \ rubygem-jquery-atwho-rails13>=1.3.2:www/rubygem-jquery-atwho-rails13 \ rubygem-jquery-rails>=4.1.0:www/rubygem-jquery-rails \ rubygem-request_store>=1.3:devel/rubygem-request_store \ rubygem-select2-rails3>=3.5.9:www/rubygem-select2-rails3 \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ rubygem-base32>=0.3.0:converters/rubygem-base32 \ rubygem-sentry-raven25>=2.5.3:devel/rubygem-sentry-raven25 \ rubygem-premailer-rails19>=1.9.7:mail/rubygem-premailer-rails19 \ rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \ rubygem-rails-i18n-4>=4.0.9:devel/rubygem-rails-i18n-4 \ rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \ rubygem-gettext_i18n_rails_js12>=1.2.0:devel/rubygem-gettext_i18n_rails_js12 \ rubygem-gettext>=3.2.2:devel/rubygem-gettext \ rubygem-batch-loader>=1.2.1:devel/rubygem-batch-loader \ rubygem-peek>=1.0.1:devel/rubygem-peek \ rubygem-peek-gc>=0.0.2:devel/rubygem-peek-gc \ rubygem-peek-host>=1.0.0:devel/rubygem-peek-host \ rubygem-peek-performance_bar>=1.3.0:devel/rubygem-peek-performance_bar \ rubygem-peek-rblineprof>=0.2.0:devel/rubygem-peek-rblineprof \ rubygem-peek-redis>=1.2.0:devel/rubygem-peek-redis \ rubygem-peek-sidekiq>=1.0.3:devel/rubygem-peek-sidekiq \ rubygem-prometheus-client-mmap>=0.7.0.beta44:devel/rubygem-prometheus-client-mmap \ rubygem-octokit46>=4.6.2:net/rubygem-octokit46 \ rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof016>=0.16.2:devel/rubygem-ruby-prof016 \ rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \ rubygem-health_check26>=2.6.0:devel/rubygem-health_check26 \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ rubygem-net-ssh41>=4.1.0:security/rubygem-net-ssh41 \ rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \ rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \ rubygem-gitaly>=0.8.0:net/rubygem-gitaly \ rubygem-toml-rb03>=0.3.15:www/rubygem-toml-rb03 \ rubygem-flipper011>=0.11.0:devel/rubygem-flipper011 \ rubygem-flipper-active_record011>=0.11.0:databases/rubygem-flipper-active_record011 \ rubygem-flipper-active_support_cache_store011>=0.11.0:devel/rubygem-flipper-active_support_cache_store011 \ rubygem-lograge>=0.5:www/rubygem-lograge \ rubygem-grape_logging>=1.7:devel/rubygem-grape_logging \ rubygem-asset_sync220>=2.2.0:net/rubygem-asset_sync220 \ rubygem-rinku>=1.7.3:www/rubygem-rinku PGSQL_RUN_DEPENDS= rubygem-pg0>=0.18.2:databases/rubygem-pg0 \ rubygem-peek-pg>=1.3.0:databases/rubygem-peek-pg MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \ rubygem-peek-mysql2>=1.1.0:databases/rubygem-peek-mysql2 USE_RUBY= yes USE_RC_SUBR= gitlab USE_GITHUB= yes GH_ACCOUNT= gitlabhq GH_PROJECT= gitlabhq USERS= git GROUPS= git NO_ARCH= yes NO_BUILD= yes post-patch-MYSQL-on: ${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample post-patch-MYSQL-off: ${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile ${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile post-patch-PGSQL-on: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample post-patch-PGSQL-off: ${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile ${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile do-install: ${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/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}/usr/home/git/repositories ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache ${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/files/patch-Gemfile =================================================================== --- head/www/gitlab/files/patch-Gemfile (revision 463764) +++ head/www/gitlab/files/patch-Gemfile (revision 463765) @@ -1,174 +1,183 @@ ---- Gemfile.orig 2018-02-05 13:37:24 UTC +--- Gemfile.orig 2018-02-16 17:13:43 UTC +++ Gemfile @@ -12,8 +12,8 @@ gem 'sprockets', '~> 3.7.0' gem 'default_value_for', '~> 3.0.0' # Supported DBs -gem 'mysql2', '~> 0.4.10', group: :mysql -gem 'pg', '~> 0.18.2', group: :postgres +gem 'mysql2', '>= 0.4.10', group: :mysql +gem 'pg', '>= 0.18.2', group: :postgres gem 'rugged', '~> 0.26.0' gem 'grape-route-helpers', '~> 2.1.0' +@@ -23,7 +23,7 @@ gem 'faraday', '~> 0.12' + # Authentication libraries + gem 'devise', '~> 4.2' + gem 'doorkeeper', '~> 4.2.0' +-gem 'doorkeeper-openid_connect', '~> 1.2.0' ++gem 'doorkeeper-openid_connect', '~> 1.2' + gem 'omniauth', '~> 1.4.2' + gem 'omniauth-auth0', '~> 1.4.1' + gem 'omniauth-azure-oauth2', '~> 0.0.9' @@ -109,7 +109,7 @@ gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.13.6' +gem 'google-api-client', '>= 0.13.6' # for aws storage gem 'unf', '~> 0.1.4' @@ -144,7 +144,7 @@ group :unicorn do end # State machine -gem 'state_machines-activerecord', '~> 0.4.0' +gem 'state_machines-activerecord', '>= 0.4.0' # Issue tags gem 'acts-as-taggable-on', '~> 4.0' @@ -159,7 +159,7 @@ gem 'sidekiq-limit_fetch', '~> 3.4', req gem 'rufus-scheduler', '~> 3.4' # HTTP requests -gem 'httparty', '~> 0.13.3' +gem 'httparty', '>= 0.13.3' # Colored output to console gem 'rainbow', '~> 2.2' @@ -209,7 +209,7 @@ gem 'kubeclient', '~> 2.2.0' gem 'd3_rails', '~> 3.5.0' # Sanitize user input -gem 'sanitize', '~> 2.0' +gem 'sanitize', '>= 2.0' gem 'babosa', '~> 1.0.2' # Sanitizes SVG input @@ -273,7 +273,7 @@ gem 'batch-loader', '~> 1.2.1' gem 'peek', '~> 1.0.1' gem 'peek-gc', '~> 0.0.2' gem 'peek-host', '~> 1.0.0' -gem 'peek-mysql2', '~> 1.1.0', group: :mysql +gem 'peek-mysql2', '>= 1.1.0', group: :mysql gem 'peek-performance_bar', '~> 1.3.0' gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' @@ -282,97 +282,11 @@ gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do - gem 'allocations', '~> 1.0', require: false, platform: :mri - gem 'method_source', '~> 0.8', require: false - gem 'influxdb', '~> 0.2', require: false - # Prometheus gem 'prometheus-client-mmap', '~> 0.7.0.beta44' gem 'raindrops', '~> 0.18' end -group :development do - gem 'foreman', '~> 0.78.0' - gem 'brakeman', '~> 3.6.0', require: false - - gem 'letter_opener_web', '~> 1.3.0' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false - - # Better errors handler - gem 'better_errors', '~> 2.1.0' - gem 'binding_of_caller', '~> 0.7.2' - - # 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.4.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - - gem 'awesome_print', '~> 1.2.0', require: false - gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.5.0' - gem 'factory_bot_rails', '~> 4.8.2' - gem 'rspec-rails', '~> 3.6.0' - gem 'rspec-retry', '~> 0.4.5' - gem 'spinach-rails', '~> 0.2.1' - gem 'spinach-rerun-reporter', '~> 0.0.2' - gem 'rspec_profiling', '~> 0.0.5' - gem 'rspec-set', '~> 0.1.3' - gem 'rspec-parameterized' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.7.0' - - # Generate Fake data - gem 'ffaker', '~> 2.4' - - gem 'capybara', '~> 2.15' - gem 'capybara-screenshot', '~> 1.0.0' - gem 'selenium-webdriver', '~> 3.5' - - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - gem 'spring-commands-spinach', '~> 1.1.0' - - gem 'gitlab-styles', '~> 2.2.0', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines - gem 'rubocop', '~> 0.52.0' - gem 'rubocop-rspec', '~> 1.20.1' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.26.0', require: false - gem 'simplecov', '~> 0.14.0', require: false - gem 'flay', '~> 2.8.0', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - - gem 'benchmark-ips', '~> 2.3.0', require: false - - gem 'license_finder', '~> 3.1', require: false - gem 'knapsack', '~> 1.11.0' - - gem 'activerecord_sane_schema_dumper', '0.2' - - gem 'stackprof', '~> 0.2.10', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false -end - -group :test do - gem 'shoulda-matchers', '~> 3.1.2', require: false - gem 'email_spec', '~> 1.6.0' - gem 'json-schema', '~> 2.8.0' - gem 'webmock', '~> 2.3.2' - gem 'test_after_commit', '~> 1.1' - gem 'sham_rack', '~> 1.3.6' - gem 'timecop', '~> 0.8.0' - gem 'concurrent-ruby', '~> 1.0.5' - gem 'test-prof', '~> 0.2.5' -end - gem 'octokit', '~> 4.6.2' gem 'mail_room', '~> 0.9.1' @@ -403,7 +317,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.64.0', require: 'gitaly' +gem 'gitaly-proto', '>= 0.64.0', require: 'gitaly' gem 'toml-rb', '~> 0.3.15', require: false @@ -416,5 +330,8 @@ gem 'flipper-active_support_cache_store' gem 'lograge', '~> 0.5' gem 'grape_logging', '~> 1.7' +gem 'rinku' + + # Asset synchronization gem 'asset_sync', '~> 2.2.0'