diff options
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 32 |
1 files changed, 21 insertions, 11 deletions
@@ -19,7 +19,7 @@ gem 'default_value_for', '~> 3.3.0' gem 'pg', '~> 1.1' gem 'rugged', '~> 0.28' -gem 'grape-path-helpers', '~> 1.2' +gem 'grape-path-helpers', '~> 1.3' gem 'faraday', '~> 0.12' gem 'marginalia', '~> 1.8.0' @@ -66,7 +66,7 @@ gem 'u2f', '~> 0.2.1' gem 'validates_hostname', '~> 1.0.10' gem 'rubyzip', '~> 2.0.0', require: 'zip' # GitLab Pages letsencrypt support -gem 'acme-client', '~> 2.0.5' +gem 'acme-client', '~> 2.0', '>= 2.0.6' # Browser detection gem 'browser', '~> 2.5' @@ -81,7 +81,9 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' gem 'net-ldap' # API -gem 'grape', '~> 1.1.0' +# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged +# Remove config/initializers/grape_patch.rb +gem 'grape', '= 1.4.0' gem 'grape-entity', '~> 0.7.1' gem 'rack-cors', '~> 1.0.6', require: 'rack/cors' @@ -140,6 +142,7 @@ gem 'deckar01-task_list', '2.3.1' gem 'gitlab-markup', '~> 1.7.1' gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.20' +gem 'kramdown', '~> 2.2.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.1.2' gem 'org-ruby', '~> 0.9.12' @@ -148,7 +151,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' -gem 'rouge', '~> 3.19.0' +gem 'rouge', '~> 3.21.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.9' @@ -163,6 +166,8 @@ gem 'diff_match_patch', '~> 0.1.0' # Application server gem 'rack', '~> 2.0.9' +# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually +gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base' group :unicorn do gem 'unicorn', '~> 5.5' @@ -172,7 +177,6 @@ end group :puma do gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false - gem 'rack-timeout', require: false end # State machine @@ -242,7 +246,9 @@ gem 'slack-messenger', '~> 2.3.3' gem 'hangouts-chat', '~> 0.0.5' # Asana integration -gem 'asana', '~> 0.9' +# asana 0.10.1 needs faraday 1.0 +# https://gitlab.com/gitlab-org/gitlab/-/issues/224296 +gem 'asana', '0.10.0' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -300,7 +306,7 @@ gem 'sentry-raven', '~> 2.9' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '0.12.0' +gem 'gitlab-labkit', '0.12.1' # I18n gem 'ruby_parser', '~> 3.8', require: false @@ -331,10 +337,9 @@ group :development do gem 'danger', '~> 6.0', require: false gem 'letter_opener_web', '~> 1.3.4' - gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false # Better errors handler - gem 'better_errors', '~> 2.5.0' + gem 'better_errors', '~> 2.7.1' gem 'binding_of_caller', '~> 0.8.0' # thin instead webrick @@ -361,7 +366,7 @@ group :development, :test do gem 'spring', '~> 2.0.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 4.2.0', require: false + gem 'gitlab-styles', '~> 4.3.0', require: false # Pin these dependencies, otherwise a new rule could break the CI pipelines gem 'rubocop', '~> 0.82.0' gem 'rubocop-performance', '~> 1.5.2' @@ -370,6 +375,7 @@ group :development, :test do gem 'scss_lint', '~> 0.56.0', require: false gem 'haml_lint', '~> 0.34.0', require: false gem 'simplecov', '~> 0.18.5', require: false + gem 'simplecov-cobertura', '~> 1.3.1', require: false gem 'bundler-audit', '~> 0.6.1', require: false gem 'benchmark-ips', '~> 2.3.0', require: false @@ -383,6 +389,8 @@ group :development, :test do gem 'png_quantizator', '~> 0.2.1', require: false gem 'parallel', '~> 1.19', require: false + + gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false end # Gems required in omnibus-gitlab pipeline @@ -452,7 +460,7 @@ group :ed25519 do end # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 13.1.0.pre.rc1' +gem 'gitaly', '~> 13.2.0.pre.rc2' gem 'grpc', '~> 1.24.0' @@ -497,3 +505,5 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.3.0' gem 'json-schema', '~> 2.8.0' +gem 'oj', '~> 3.10.6' +gem 'multi_json', '~> 1.14.1' |