diff options
Diffstat (limited to 'www/gitlab-ce/files')
| -rw-r--r-- | www/gitlab-ce/files/patch-Gemfile | 20 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_gitlab.yml.example | 10 | ||||
| -rw-r--r-- | www/gitlab-ce/files/patch-config_initializers_1__settings.rb | 18 |
3 files changed, 25 insertions, 23 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 9c6ae35dc8c6..eb7a1931afc7 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2020-01-30 15:15:59 UTC +--- Gemfile.orig 2020-01-31 21:59:11 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -19,7 +19,7 @@ @@ -149,7 +148,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.9' + gem 'asciidoctor-plantuml', '0.0.10' -gem 'rouge', '~> 3.11.0' +gem 'rouge', '~> 3.11' gem 'truncato', '~> 0.7.11' @@ -34,7 +34,7 @@ # Jira integration gem 'jira-ruby', '~> 1.7' -@@ -329,90 +328,6 @@ group :metrics do +@@ -329,94 +328,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.10.0' gem 'raindrops', '~> 0.18' @@ -75,11 +75,11 @@ - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 2.7', require: false +- gem 'gitlab-styles', '~> 3.1.0', require: false - # Pin these dependencies, otherwise a new rule could break the CI pipelines -- gem 'rubocop', '~> 0.69.0' -- gem 'rubocop-performance', '~> 1.1.0' -- gem 'rubocop-rspec', '~> 1.22.1' +- gem 'rubocop', '~> 0.74.0' +- gem 'rubocop-performance', '~> 1.4.1' +- gem 'rubocop-rspec', '~> 1.37.0' - - gem 'scss_lint', '~> 0.56.0', require: false - gem 'haml_lint', '~> 0.34.0', require: false @@ -95,6 +95,10 @@ - gem 'simple_po_parser', '~> 1.1.2', require: false - - gem 'timecop', '~> 0.8.0' +- +- gem 'png_quantizator', '~> 0.2.1', require: false +- +- gem 'parallel', '~> 1.19', require: false -end - -# Gems required in omnibus-gitlab pipeline @@ -124,4 +128,4 @@ - gem 'guard-rspec' end - gem 'octokit', '~> 4.9' + gem 'octokit', '~> 4.15' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index aa04862513b3..15503988bfe1 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2020-01-02 15:06:44 UTC +--- config/gitlab.yml.example.orig 2020-01-31 21:59:11 UTC +++ config/gitlab.yml.example -@@ -910,7 +910,7 @@ production: &base +@@ -916,7 +916,7 @@ production: &base # Gitaly settings gitaly: # Path to the directory containing Gitaly client executables. @@ -9,7 +9,7 @@ # Default Gitaly authentication token. Can be overridden per storage. Can # be left blank when Gitaly is running locally on a Unix socket, which # is the normal way to deploy Gitaly. -@@ -928,8 +928,8 @@ production: &base +@@ -934,8 +934,8 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -20,7 +20,7 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings -@@ -975,12 +975,12 @@ production: &base +@@ -981,12 +981,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -36,7 +36,7 @@ # Git over HTTP upload_pack: true -@@ -1005,7 +1005,7 @@ production: &base +@@ -1011,7 +1011,7 @@ production: &base # CAUTION! # Use the default values unless you really know what you are doing git: diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb index ba6dad7e8c50..b50648cad4c0 100644 --- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb @@ -1,17 +1,15 @@ ---- config/initializers/1_settings.rb.orig 2019-12-03 11:22:02 UTC +--- config/initializers/1_settings.rb.orig 2020-01-31 21:59:11 UTC +++ config/initializers/1_settings.rb -@@ -179,12 +179,8 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting - Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) - Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) - Settings.gitlab['user'] ||= 'git' --Settings.gitlab['user_home'] ||= begin +@@ -179,11 +179,7 @@ Settings.gitlab['email_smime'] = SmimeSignatureSetting + Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url) + Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url) + Settings.gitlab['user'] ||= 'git' +-Settings.gitlab['user_home'] ||= begin - Etc.getpwnam(Settings.gitlab['user']).dir -rescue ArgumentError # no user configured - '/home/' + Settings.gitlab['user'] -end --Settings.gitlab['time_zone'] ||= nil -+Settings.gitlab['user_home'] ||= '/usr/home/' + Settings.gitlab['user'] -+Settings.gitlab['time_zone'] ||= nil ++Settings.gitlab['user_home'] ||= '/usr/local/git' + Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? Settings.gitlab['signin_enabled'] ||= true if Settings.gitlab['signin_enabled'].nil? - Settings.gitlab['restricted_visibility_levels'] = Settings.__send__(:verify_constant_array, Gitlab::VisibilityLevel, Settings.gitlab['restricted_visibility_levels'], []) |