We should be able to update minor versions of stable libs without breaking gitlab Gemfile --- a/Gemfile +++ b/Gemfile @@ -2,58 +2,58 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0.3.7' +gem 'rails', '~> 6.0.3','>= 6.0.3.7' -gem 'bootsnap', '~> 1.4.6' +gem 'bootsnap', '~> 1.4', '>= 1.4.6' # Responders respond_to and respond_with gem 'responders', '~> 3.0' -gem 'sprockets', '~> 3.7.0' +gem 'sprockets', '~> 3.7' # Default values for AR models -gem 'default_value_for', '~> 3.4.0' +gem 'default_value_for', '~> 3.4' # Supported DBs gem 'pg', '~> 1.1' gem 'rugged', '~> 1.1' -gem 'grape-path-helpers', '~> 1.6.3' +gem 'grape-path-helpers', '~> 1.6', '>= 1.6.3' gem 'faraday', '~> 1.0' -gem 'marginalia', '~> 1.10.0' +gem 'marginalia', '~> 1.10' # Authorization -gem 'declarative_policy', '~> 1.0.0' +gem 'declarative_policy', '~> 1.0' # Authentication libraries -gem 'devise', '~> 4.7.2' +gem 'devise', '~> 4.7', '>= 4.7.2' 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.12.1' +gem 'doorkeeper', '~> 5.5' +gem 'doorkeeper-openid_connect', '~> 1.7', '>= 1.7.5' +gem 'rexml', '~> 3.2', '>= 3.2.5' +gem 'ruby-saml', '~> 1.12', '>= 1.12.1' gem 'omniauth', '~> 1.8' -gem 'omniauth-auth0', '~> 2.0.0' +gem 'omniauth-auth0', '~> 2.0' gem 'omniauth-azure-activedirectory-v2', '~> 0.1' gem 'omniauth-azure-oauth2', '~> 0.0.9' # Deprecated v1 version -gem 'omniauth-cas3', '~> 1.1.4' -gem 'omniauth-facebook', '~> 4.0.0' +gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4' +gem 'omniauth-facebook', '~> 4.0' gem 'omniauth-github', '~> 1.4' -gem 'omniauth-gitlab', '~> 1.0.2' +gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2' gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' -gem 'omniauth-shibboleth', '~> 1.3.0' +gem 'omniauth-shibboleth', '~> 1.3' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0' +gem 'omniauth_crowd', '~> 2.4' gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect' -gem 'omniauth-salesforce', '~> 1.0.5' +gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5' gem 'omniauth-atlassian-oauth2', '~> 0.2.0' -gem 'rack-oauth2', '~> 1.16.0' -gem 'jwt', '~> 2.1.0' +gem 'rack-oauth2', '~> 1.16' +gem 'jwt', '~> 2.1' # Kerberos authentication. EE-only gem 'gssapi', group: :kerberos @@ -61,17 +61,17 @@ # Spam and anti-bot protection gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 1.1.0' +gem 'invisible_captcha', '~> 1.1' # Two-factor authentication -gem 'devise-two-factor', '~> 4.0.0' +gem 'devise-two-factor', '~> 4.0' gem 'rqrcode-rails3', '~> 0.1.7' -gem 'attr_encrypted', '~> 3.1.0' +gem 'attr_encrypted', '~> 3.1' gem 'u2f', '~> 0.2.1' # GitLab Pages -gem 'validates_hostname', '~> 1.0.11' -gem 'rubyzip', '~> 2.0.0', require: 'zip' +gem 'validates_hostname', '~> 1.0', '>= 1.0.11' +gem 'rubyzip', '~> 2.0', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0', '>= 2.0.6' @@ -82,27 +82,27 @@ gem 'ohai', '~> 16.10' # GPG -gem 'gpgme', '~> 2.0.19' +gem 'gpgme', '~> 2.0', '>= 2.0.19' # LDAP Auth # 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.1', '>= 2.1.1', require: 'omniauth-ldap' gem 'net-ldap', '~> 0.16.3' # API -gem 'grape', '~> 1.5.2' +gem 'grape', '~> 1.5', '>= 1.5.2' gem 'grape-entity', '~> 0.9.0' -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' +gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors' # GraphQL API -gem 'graphql', '~> 1.11.8' +gem 'graphql', '~> 1.11', '>= 1.11.8' # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771 # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # 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 'graphiql-rails', '~> 1.4', '>= 1.4.10' +gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2' +gem 'graphql-docs', '~> 1.6', group: [:development, :test] gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' @@ -113,11 +113,11 @@ gem 'kaminari', '~> 1.0' # HAML -gem 'hamlit', '~> 2.15.0' +gem 'hamlit', '~> 2.15' # Files attachments gem 'carrierwave', '~> 1.3' -gem 'mini_magick', '~> 4.10.1' +gem 'mini_magick', '~> 4.10', '>= 4.10.1' # for backups gem 'fog-aws', '~> 3.9' @@ -129,7 +129,7 @@ gem 'fog-openstack', '~> 1.0' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.3' -gem 'gitlab-fog-azure-rm', '~> 1.0.1', require: false +gem 'gitlab-fog-azure-rm', '~> 1.0', '>= 1.0.1', require: false # for Google storage gem 'google-api-client', '~> 0.33' @@ -138,37 +138,37 @@ gem 'unf', '~> 0.1.4' # Seed data -gem 'seed-fu', '~> 2.3.7' +gem 'seed-fu', '~> 2.3', '>= 2.3.7' # Search gem 'elasticsearch-model', '~> 6.1' gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation' -gem 'elasticsearch-api', '~> 6.8.2' +gem 'elasticsearch-api', '~> 6.8', '>= 6.8.2' gem 'aws-sdk-core', '~> 3' gem 'aws-sdk-cloudformation', '~> 1' gem 'aws-sdk-s3', '~> 1' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # Markdown and HTML processing -gem 'html-pipeline', '~> 2.13.2' -gem 'deckar01-task_list', '2.3.1' -gem 'gitlab-markup', '~> 1.7.1' -gem 'github-markup', '~> 1.7.0', require: 'github/markup' +gem 'html-pipeline', '~> 2.13', '>= 2.13.2' +gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1' +gem 'gitlab-markup', '~> 1.7', '>= 1.7.1' +gem 'github-markup', '~> 1.7', require: 'github/markup' gem 'commonmarker', '~> 0.21' -gem 'kramdown', '~> 2.3.1' -gem 'RedCloth', '~> 4.3.2' -gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 +gem 'kramdown', '~> 2.3','>= 2.3.1' +gem 'RedCloth', '~> 4.3', '>= 4.3.2' +gem 'gitlab-rdoc', '~> 6.3', '>= 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 2.0.10' +gem 'asciidoctor', '~> 2.0', '>= 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.4.0', require: false -gem 'rouge', '~> 3.26.0' +gem 'rouge', '~> 3.26' gem 'truncato', '~> 0.7.11' -gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.11.4' +gem 'bootstrap_form', '~> 4.2' +gem 'nokogiri', '~> 1.11','>= 1.11.4' gem 'escape_utils', '~> 1.1' # Calendar rendering @@ -179,7 +179,7 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3' +gem 'rack', '~> 2.2', '>= 2.2.3' # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' @@ -189,7 +189,7 @@ end group :puma do - gem 'puma', '~> 5.1.1', require: false + gem 'puma', '~> 5.1', '>= 5.1.1', require: false gem 'puma_worker_killer', '~> 0.3.1', require: false end @@ -200,13 +200,13 @@ gem 'acts-as-taggable-on', '~> 7.0' # Background jobs -gem 'sidekiq', '~> 5.2.7' +gem 'sidekiq', '~> 5.2', '>= 5.2.7' gem 'sidekiq-cron', '~> 1.0' -gem 'redis-namespace', '~> 1.7.0' +gem 'redis-namespace', '~> 1.7' gem 'gitlab-sidekiq-fetcher', '0.5.6', require: 'sidekiq-reliable-fetch' # Cron Parser -gem 'fugit', '~> 1.2.1' +gem 'fugit', '~> 1.2', '>= 1.2.1' # HTTP requests gem 'httparty', '~> 0.16.4' @@ -218,14 +218,14 @@ gem 'ruby-progressbar', '~> 1.10' # GitLab settings -gem 'settingslogic', '~> 2.0.9' +gem 'settingslogic', '~> 2.0', '>= 2.0.9' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.2.0' +gem 're2', '~> 1.2' # Misc -gem 'version_sorter', '~> 2.2.4' +gem 'version_sorter', '~> 2.2', '>= 2.2.4' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.4' @@ -238,20 +238,20 @@ gem 'connection_pool', '~> 2.0' # Redis session store -gem 'redis-rails', '~> 5.0.2' +gem 'redis-rails', '~> 5.0', '>= 5.0.2' # Discord integration gem 'discordrb-webhooks', '~> 3.4', require: false # Jira integration -gem 'jira-ruby', '~> 2.1.4' +gem 'jira-ruby', '~> 2.1', '>= 2.1.4' gem 'atlassian-jwt', '~> 0.2.0' # Flowdock integration gem 'flowdock', '~> 0.7' # Slack integration -gem 'slack-messenger', '~> 2.3.4' +gem 'slack-messenger', '~> 2.3', '>= 2.3.4' # Hangouts Chat integration gem 'hangouts-chat', '~> 0.0.5' @@ -263,17 +263,17 @@ gem 'ruby-fogbugz', '~> 0.2.1' # Kubernetes integration -gem 'kubeclient', '~> 4.9.1' +gem 'kubeclient', '~> 4.9', '>= 4.9.1' # Sanitize user input -gem 'sanitize', '~> 5.2.1' -gem 'babosa', '~> 1.0.4' +gem 'sanitize', '~> 5.2', '>= 5.2.1' +gem 'babosa', '~> 1.0', '>= 1.0.2' # Sanitizes SVG input gem 'loofah', '~> 2.2' # Working with license -gem 'licensee', '~> 9.14.1' +gem 'licensee', '~> 9.14', '>= 9.14.1' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.7' @@ -290,28 +290,28 @@ gem 'rack-proxy', '~> 0.6.0' -gem 'sassc-rails', '~> 2.1.0' -gem 'autoprefixer-rails', '10.2.0.0' -gem 'terser', '1.0.2' +gem 'sassc-rails', '~> 2.1' +gem 'autoprefixer-rails', '~> 10.2' +gem 'terser', '~> 1.0', '>= 1.0.2' gem 'addressable', '~> 2.7' gem 'gemojione', '~> 3.3' -gem 'gon', '~> 6.4.0' +gem 'gon', '~> 6.4' gem 'request_store', '~> 1.5' gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 1.5' # Protect against bruteforcing -gem 'rack-attack', '~> 6.3.0' +gem 'rack-attack', '~> 6.3' # Sentry integration gem 'sentry-raven', '~> 3.0' # PostgreSQL query parsing -gem 'pg_query', '~> 1.3.0' +gem 'pg_query', '~> 1.3' -gem 'premailer-rails', '~> 1.10.3' +gem 'premailer-rails', '~> 1.10', '>= 1.10.3' # LabKit: Tracing and Correlation gem 'gitlab-labkit', '~> 0.16.2' @@ -322,11 +322,11 @@ # I18n gem 'ruby_parser', '~> 3.15', require: false gem 'rails-i18n', '~> 6.0' -gem 'gettext_i18n_rails', '~> 1.8.0' +gem 'gettext_i18n_rails', '~> 1.8' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.3', require: false, group: :development -gem 'batch-loader', '~> 2.0.1' +gem 'batch-loader', '~> 2.0', '>= 2.0.1' # Perf bar gem 'peek', '~> 1.1' @@ -358,38 +358,38 @@ end group :development, :test do - gem 'deprecation_toolkit', '~> 1.5.1', require: false - gem 'bullet', '~> 6.1.3' + gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false + gem 'bullet', '~> 6.1', '>= 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' + gem 'database_cleaner', '~> 1.7' + gem 'factory_bot_rails', '~> 6.1' + gem 'rspec-rails', '~> 4.0', '>= 4.0.2' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' + gem 'minitest', '~> 5.11' # Generate Fake data gem 'ffaker', '~> 2.10' - gem 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' + gem 'spring', '~> 2.1' + gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4' - gem 'gitlab-styles', '~> 6.2.0', require: false + gem 'gitlab-styles', '~> 6.2', 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 'benchmark-ips', '~> 2.3', require: false - gem 'knapsack', '~> 1.21.1' + gem 'knapsack', '~> 1.21', '>= 1.21.1' gem 'crystalball', '~> 0.7.0', require: false - gem 'simple_po_parser', '~> 1.1.2', require: false + gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false gem 'timecop', '~> 0.9.1' @@ -417,18 +417,18 @@ end group :test do - gem 'fuubar', '~> 2.2.0' + gem 'fuubar', '~> 2.2' 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 'capybara', '~> 3.35', '~> 3.35.3' + gem 'capybara-screenshot', '~> 1.0', '>= 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 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false + gem 'email_spec', '~> 2.2' + gem 'webmock', '~> 3.9', '>= 3.9.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 0.12.0' @@ -447,7 +447,7 @@ gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 1.3.0' +gem 'ruby-prof', '~> 1.3' gem 'stackprof', '~> 0.2.15', require: false gem 'rbtrace', '~> 0.4', require: false gem 'memory_profiler', '~> 0.9', require: false @@ -461,8 +461,8 @@ gem 'health_check', '~> 3.0' # System information -gem 'vmstat', '~> 2.3.0' -gem 'sys-filesystem', '~> 1.1.6' +gem 'vmstat', '~> 2.3' +gem 'sys-filesystem', '~> 1.1', '>= 1.1.6' # NTP client gem 'net-ntp' @@ -481,13 +481,13 @@ gem 'spamcheck', '~> 0.1.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.12.0.pre.rc1' +gem 'gitaly', '~> 13.12' -gem 'grpc', '~> 1.30.2' +gem 'grpc', '~> 1.30', '>= 1.30.2' -gem 'google-protobuf', '~> 3.14.0' +gem 'google-protobuf', '~> 3.14' -gem 'toml-rb', '~> 1.0.0' +gem 'toml-rb', '~> 1.0' # Feature toggles gem 'flipper', '~> 0.17.1' @@ -506,12 +506,12 @@ # Countries list gem 'countries', '~> 3.0' -gem 'retriable', '~> 3.1.2' +gem 'retriable', '~> 3.1', '>= 3.1.2' # LRU cache gem 'lru_redux' -gem 'erubi', '~> 1.9.0' +gem 'erubi', '~> 1.9' # Locked as long as quoted-printable encoding issues are not resolved # Monkey-patched in `config/initializers/mail_encoding_patch.rb` @@ -526,11 +526,11 @@ gem 'valid_email', '~> 0.1' # JSON -gem 'json', '~> 2.3.0' +gem 'json', '~> 2.3' gem 'json_schemer', '~> 0.2.12' -gem 'oj', '~> 3.10.6' -gem 'multi_json', '~> 1.14.1' -gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' +gem 'oj', '~> 3.10', '>= 3.10.6' +gem 'multi_json', '~> 1.14', '>= 1.14.1' +gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl' gem 'webauthn', '~> 2.3'