Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
gitlab-ee: 11.5.5 -> 11.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@flokli
flokli committed Dec 25, 2018
1 parent 7ea6bde commit 4d7ce7a
Show file tree
Hide file tree
Showing 4 changed files with 377 additions and 273 deletions.
16 changes: 8 additions & 8 deletions pkgs/applications/version-management/gitlab/data.json
View file
Expand Up @@ -15,18 +15,18 @@
}
},
"ee": {
"version": "11.5.5",
"repo_hash": "1j5g0x7rxrdb39b12psjirsa3s0lhqgnxh0q3r22cgzgxv0332b8",
"deb_hash": "193s1f7w9lcamqnmrc7c3klmybqqra7yr16x6ay0cznwcdgirisp",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.5.5-ee.0_amd64.deb/download.deb",
"version": "11.6.0",
"repo_hash": "0zaif61qf7y0r7sh3vdmxacvzw8hcgj8xhj69iy0jcxf508wbysh",
"deb_hash": "1ksdnfzfdb2qcvq60dhhxi5iab8bjvddfnjbs6zaw0m0ymdrnsxb",
"deb_url": "https://packages.gitlab.com/gitlab/gitlab-ee/packages/debian/stretch/gitlab-ee_11.6.0-ee.0_amd64.deb/download.deb",
"owner": "gitlab-org",
"repo": "gitlab-ee",
"rev": "v11.5.5-ee",
"rev": "v11.6.0-ee",
"passthru": {
"GITALY_SERVER_VERSION": "0.129.0",
"GITALY_SERVER_VERSION": "1.7.1",
"GITLAB_PAGES_VERSION": "1.3.1",
"GITLAB_SHELL_VERSION": "8.4.1",
"GITLAB_WORKHORSE_VERSION": "7.1.3"
"GITLAB_SHELL_VERSION": "8.4.3",
"GITLAB_WORKHORSE_VERSION": "7.6.0"
}
}
}
61 changes: 40 additions & 21 deletions pkgs/applications/version-management/gitlab/rubyEnv-ee/Gemfile
View file
@@ -1,27 +1,38 @@
# --- Special code for migrating to Rails 5.0 ---
def rails5?
%w[1 true].include?(ENV["RAILS5"])
!%w[0 false].include?(ENV["RAILS5"])
end

gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2'
gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11'
gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'

# The 2.0.6 version of rack requires monkeypatch to be present in
# `config.ru`. This can be removed once a new update for Rack
# is available that contains https://github.com/rack/rack/pull/1201.
gem_versions['rack'] = rails5? ? '2.0.6' : '1.6.11'
# --- The end of special code for migrating to Rails 5.0 ---

source 'https://rubygems.org'

gem 'rails', gem_versions['rails']
gem 'rails-deprecated_sanitizer', '~> 1.0.3'

# Improves copy-on-write performance for MRI
gem 'nakayoshi_fork', '~> 0.0.4'

# Responders respond_to and respond_with
gem 'responders', '~> 2.0'

gem 'sprockets', '~> 3.7.0'

# Default values for AR models
gem 'default_value_for', gem_versions['default_value_for']
if rails5?
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
else
gem 'default_value_for', '~> 3.0.0'
end

# Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql
Expand Down Expand Up @@ -74,7 +85,7 @@ gem 'validates_hostname', '~> 1.0.6'
gem 'browser', '~> 2.5'

# GPG
gem 'gpgme'
gem 'gpgme', '~> 2.0.18'

# LDAP Auth
# GitLab fork with several improvements to original library. For full list of changes
Expand All @@ -83,7 +94,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.0.4', require: 'omniauth-ldap'
gem 'net-ldap'

# API
gem 'grape', '~> 1.1'
gem 'grape', '~> 1.1.0'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'

Expand Down Expand Up @@ -134,7 +145,7 @@ gem 'faraday_middleware-aws-signers-v4'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.8'
gem 'deckar01-task_list', '2.0.0'
gem 'gitlab-markup', '~> 1.6.4'
gem 'gitlab-markup', '~> 1.6.5'
gem 'github-markup', '~> 1.7.0', require: 'github/markup'
gem 'redcarpet', '~> 3.4'
gem 'commonmarker', '~> 0.17'
Expand All @@ -143,7 +154,7 @@ gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
gem 'asciidoctor', '~> 1.5.6'
gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
Expand All @@ -158,6 +169,8 @@ gem 'icalendar'
gem 'diffy', '~> 3.1.0'

# Application server
gem 'rack', gem_versions['rack']

group :unicorn do
gem 'unicorn', '~> 5.1.0'
gem 'unicorn-worker-killer', '~> 0.4.4'
Expand All @@ -178,6 +191,7 @@ gem 'acts-as-taggable-on', '~> 5.0'
gem 'sidekiq', '~> 5.2.1'
gem 'sidekiq-cron', '~> 0.6.0'
gem 'redis-namespace', '~> 1.6.0'
gem 'gitlab-sidekiq-fetcher', '~> 0.1.0', require: 'sidekiq-reliable-fetch'

# Cron Parser
gem 'rufus-scheduler', '~> 3.4'
Expand Down Expand Up @@ -214,6 +228,9 @@ gem 'redis-rails', '~> 5.0.2'
gem 'redis', '~> 3.2'
gem 'connection_pool', '~> 2.0'

# Discord integration
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false

# HipChat integration
gem 'hipchat', '~> 1.5.0'

Expand All @@ -230,13 +247,13 @@ gem 'slack-notifier', '~> 1.5.1'
gem 'hangouts-chat', '~> 0.0.5'

# Asana integration
gem 'asana', '~> 0.6.0'
gem 'asana', '~> 0.8.1'

# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'

# Kubernetes integration
gem 'kubeclient', '~> 3.1.0'
gem 'kubeclient', '~> 4.0.0'

# Sanitize user input
gem 'sanitize', '~> 4.6'
Expand All @@ -257,6 +274,9 @@ gem 'ace-rails-ap', '~> 4.1.0'
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.5'

# Detect mime content type from content
gem 'mimemagic', '~> 0.3.2'

# Faster blank
gem 'fast_blank'

Expand Down Expand Up @@ -294,7 +314,7 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
gem 'gettext_i18n_rails_js', '~> 1.3'
gem 'gettext', '~> 3.2.2', require: false, group: :development

gem 'batch-loader', '~> 1.2.1'
gem 'batch-loader', '~> 1.2.2'

# Perf bar
gem 'peek', '~> 1.0.1'
Expand All @@ -303,7 +323,6 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
gem 'gitlab-sidekiq-fetcher', require: 'sidekiq-reliable-fetch'

# Metrics
group :metrics do
Expand All @@ -323,8 +342,8 @@ group :development do
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'
gem 'better_errors', '~> 2.5.0'
gem 'binding_of_caller', '~> 0.8.0'

# thin instead webrick
gem 'thin', '~> 1.7.0'
Expand All @@ -351,7 +370,7 @@ group :development, :test do
gem 'minitest', '~> 5.7.0'

# Generate Fake data
gem 'ffaker', '~> 2.4'
gem 'ffaker', '~> 2.10'

gem 'capybara', '~> 2.15'
gem 'capybara-screenshot', '~> 1.0.0'
Expand All @@ -366,14 +385,14 @@ group :development, :test do
gem 'rubocop-rspec', '~> 1.22.1'

gem 'scss_lint', '~> 0.56.0', require: false
gem 'haml_lint', '~> 0.26.0', require: false
gem 'haml_lint', '~> 0.28.0', require: false
gem 'simplecov', '~> 0.14.0', require: false
gem 'bundler-audit', '~> 0.5.0', require: false

gem 'benchmark-ips', '~> 2.3.0', require: false

gem 'license_finder', '~> 5.4', require: false
gem 'knapsack', '~> 1.16'
gem 'knapsack', '~> 1.17'

gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']

Expand All @@ -392,7 +411,7 @@ group :test do
gem 'rails-controller-testing' if rails5? # Rails5 only gem.
gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
gem 'sham_rack', '~> 1.3.6'
gem 'concurrent-ruby', '~> 1.0.5'
gem 'concurrent-ruby', '~> 1.1'
gem 'test-prof', '~> 0.2.5'
gem 'rspec_junit_formatter'
end
Expand Down Expand Up @@ -431,7 +450,7 @@ group :ed25519 do
end

# Gitaly GRPC client
gem 'gitaly-proto', '~> 0.123.0', require: 'gitaly'
gem 'gitaly-proto', '~> 1.3.0', require: 'gitaly'
gem 'grpc', '~> 1.15.0'

gem 'google-protobuf', '~> 3.6'
Expand Down

0 comments on commit 4d7ce7a

Please sign in to comment.