diff options
Diffstat (limited to 'www/gitlab-ce/files')
6 files changed, 18 insertions, 50 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index a00d2284d787..21aff8dff2a0 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2021-10-01 16:06:26 UTC +--- Gemfile.orig 2021-10-21 22:00:37 UTC +++ Gemfile @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes @@ -17,15 +17,6 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -229,7 +228,7 @@ gem 'js_regex', '~> 3.7' - gem 'device_detector' - - # Redis --gem 'redis', '~> 4.1.4' -+gem 'redis', '~> 4.1' - gem 'connection_pool', '~> 2.0' - - # Redis session store @@ -332,106 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics @@ -39,7 +30,7 @@ - gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false - -- gem 'letter_opener_web', '~> 1.4.0' +- gem 'letter_opener_web', '~> 1.4.1' - - # Better errors handler - gem 'better_errors', '~> 2.9.0' @@ -53,7 +44,7 @@ - gem 'bullet', '~> 6.1.3' - gem 'pry-byebug' - gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.4.0' +- gem 'pry-shell', '~> 0.5.0' - - gem 'awesome_print', require: false - @@ -122,7 +113,7 @@ - gem 'webmock', '~> 3.9.1' - gem 'rails-controller-testing' - gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 0.12.0' +- gem 'test-prof', '~> 1.0.7' - gem 'rspec_junit_formatter' - gem 'guard-rspec' - @@ -133,7 +124,7 @@ gem 'octokit', '~> 4.15' # https://gitlab.com/gitlab-org/gitlab/issues/207207 -@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc1' +@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 6c9974f4a7df..943d15234fb2 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2021-10-01 16:06:26 UTC +--- config/gitlab.yml.example.orig 2021-10-21 22:00:37 UTC +++ config/gitlab.yml.example @@ -1128,14 +1128,14 @@ production: &base # real path not the symlink. @@ -50,7 +50,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1220,13 +1220,13 @@ production: &base +@@ -1223,13 +1223,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -66,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1453,13 +1453,13 @@ test: +@@ -1459,13 +1459,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_redis.cache.yml.example b/www/gitlab-ce/files/patch-config_redis.cache.yml.example deleted file mode 100644 index 6b4ab859e73a..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.cache.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.cache.yml.example.orig 2020-05-23 10:51:33 UTC -+++ config/redis.cache.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6380 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.cache.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.queues.yml.example b/www/gitlab-ce/files/patch-config_redis.queues.yml.example deleted file mode 100644 index 1d760f26bde3..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.queues.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.queues.yml.example.orig 2020-05-23 10:52:06 UTC -+++ config/redis.queues.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6381 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.queues.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example b/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example deleted file mode 100644 index 1e7e1b9e5a11..000000000000 --- a/www/gitlab-ce/files/patch-config_redis.shared__state.yml.example +++ /dev/null @@ -1,11 +0,0 @@ ---- config/redis.shared_state.yml.example.orig 2020-05-23 10:48:31 UTC -+++ config/redis.shared_state.yml.example -@@ -18,7 +18,7 @@ test: - # url: redis://localhost:6382 - production: - # Redis (single instance) -- url: unix:/var/run/redis/redis.shared_state.sock -+ url: unix:/var/run/redis/redis.sock - ## - # Redis + Sentinel (for HA) - # diff --git a/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb new file mode 100644 index 000000000000..46586cc70edf --- /dev/null +++ b/www/gitlab-ce/files/patch-lib_gitlab_sidekiq__logging_structured__logger.rb @@ -0,0 +1,10 @@ +--- lib/gitlab/sidekiq_logging/structured_logger.rb.orig 2021-10-26 19:13:52 UTC ++++ lib/gitlab/sidekiq_logging/structured_logger.rb +@@ -2,6 +2,7 @@ + + require 'active_record' + require 'active_record/log_subscriber' ++require 'sidekiq/job_logger' + + module Gitlab + module SidekiqLogging |