diff options
author | Robin Gloster <mail@glob.in> | 2018-09-25 02:32:02 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-09-25 03:53:32 +0200 |
commit | ed85eb5433199646fe196c77a9be23ef392bba4e (patch) | |
tree | e693ba31a88db639e724ec0320dcf8cb0f7f36d8 /pkgs/applications/version-management/gitlab/Gemfile | |
parent | cbc21b8b90c9e5f5f5656d5c3d8bb652c660bfeb (diff) | |
download | nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar.gz nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar.bz2 nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar.lz nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar.xz nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.tar.zst nixpkgs-ed85eb5433199646fe196c77a9be23ef392bba4e.zip |
gitlab: 11.2.3 -> 11.3.0
Diffstat (limited to 'pkgs/applications/version-management/gitlab/Gemfile')
-rw-r--r-- | pkgs/applications/version-management/gitlab/Gemfile | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 3aa4cad037f..f14e05d43e0 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -54,9 +54,6 @@ gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' -# Kerberos authentication. EE-only -gem 'gssapi', group: :kerberos - # Spam and anti-bot protection gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' gem 'akismet', '~> 2.0' @@ -71,7 +68,7 @@ gem 'u2f', '~> 0.2.1' gem 'validates_hostname', '~> 1.0.6' # Browser detection -gem 'browser', '~> 2.2' +gem 'browser', '~> 2.5' # GPG gem 'gpgme' @@ -110,7 +107,9 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -gem 'carrierwave', '~> 1.2' +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. +# config/initializers/carrierwave_patch.rb can be removed once that change is released. +gem 'carrierwave', '= 1.2.3' gem 'mini_magick' # Drag and Drop UI @@ -119,14 +118,14 @@ gem 'dropzonejs-rails', '~> 0.7.1' # for backups gem 'fog-aws', '~> 2.0.1' gem 'fog-core', '~> 1.44' -gem 'fog-google', '~> 1.3.3' +gem 'fog-google', '~> 1.7.1' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' gem 'fog-aliyun', '~> 0.2.0' # for Google storage -gem 'google-api-client', '~> 0.19.8' +gem 'google-api-client', '~> 0.23' # for aws storage gem 'unf', '~> 0.1.4' @@ -134,13 +133,6 @@ gem 'unf', '~> 0.1.4' # Seed data gem 'seed-fu', '~> 2.3.7' -# Search -gem 'elasticsearch-model', '~> 0.1.9' -gem 'elasticsearch-rails', '~> 0.1.9' -gem 'elasticsearch-api', '5.0.3' -gem 'aws-sdk' -gem 'faraday_middleware-aws-signers-v4' - # Markdown and HTML processing gem 'html-pipeline', '~> 2.8' gem 'deckar01-task_list', '2.0.0' @@ -190,7 +182,7 @@ gem 'rufus-scheduler', '~> 3.4' gem 'httparty', '~> 0.13.3' # Colored output to console -gem 'rainbow', '~> 2.2' +gem 'rainbow', '~> 3.0' # Progress bar gem 'ruby-progressbar' @@ -205,6 +197,9 @@ gem 're2', '~> 1.1.1' gem 'version_sorter', '~> 2.1.0' +# Export Ruby Regex to Javascript +gem 'js_regex', '~> 2.2.1' + # User agent parsing gem 'device_detector' @@ -224,9 +219,6 @@ gem 'jira-ruby', '~> 1.4' # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' -# Gemnasium integration -gem 'gemnasium-gitlab-service', '~> 0.2' - # Slack integration gem 'slack-notifier', '~> 1.5.1' @@ -287,8 +279,6 @@ gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' gem 'base32', '~> 0.3.0' -gem "gitlab-license", "~> 1.0" - # Sentry integration gem 'sentry-raven', '~> 2.7' @@ -375,12 +365,11 @@ group :development, :test do 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.10.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 'license_finder', '~> 5.4', require: false gem 'knapsack', '~> 1.16' gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper'] @@ -402,6 +391,7 @@ group :test do gem 'sham_rack', '~> 1.3.6' gem 'concurrent-ruby', '~> 1.0.5' gem 'test-prof', '~> 0.2.5' + gem 'rspec_junit_formatter' end gem 'octokit', '~> 4.9' @@ -424,9 +414,6 @@ gem 'health_check', '~> 2.6.0' gem 'vmstat', '~> 2.3.0' gem 'sys-filesystem', '~> 1.1.6' -# NTP client -gem 'net-ntp' - # SSH host key support gem 'net-ssh', '~> 5.0' gem 'sshkey', '~> 1.9.0' @@ -438,7 +425,7 @@ group :ed25519 do end # Gitaly GRPC client -gem 'gitaly-proto', '~> 0.113.0', require: 'gitaly' +gem 'gitaly-proto', '~> 0.117.0', require: 'gitaly' gem 'grpc', '~> 1.11.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed |