Skip to content

Commit fb663cc

Browse files
author
GitLab Bot
committed
Add latest changes from gitlab-org/gitlab@master
1 parent c0fe5a7 commit fb663cc

File tree

120 files changed

+2184
-1106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2184
-1106
lines changed

‎.eslintrc.yml

+6
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ rules:
126126
message: 'No hard coded url, use `PROMO_URL` in `jh_else_ce/lib/utils/url_utility`'
127127
- selector: TemplateLiteral[expressions.0.name=DOCS_URL] > TemplateElement[value.cooked=/\u002Fjh|\u002Fee/]
128128
message: '`/ee` or `/jh` path found in docs url, use `DOCS_URL_IN_EE_DIR` in `jh_else_ce/lib/utils/url_utility`'
129+
no-restricted-properties:
130+
- error
131+
- object: window
132+
property: open
133+
message: 'Use `visitUrl` in `jh_else_ce/lib/utils/url_utility` to avoid cross-site leaks.'
129134
no-restricted-imports:
130135
- error
131136
- paths:
@@ -191,6 +196,7 @@ overrides:
191196
message: 'No hard coded url, use `PROMO_URL` in `jh_else_ce/lib/utils/url_utility`'
192197
- selector: TemplateLiteral[expressions.0.name=DOCS_URL] > TemplateElement[value.cooked=/\u002Fjh|\u002Fee/]
193198
message: '`/ee` or `/jh` path found in docs url, use `DOCS_URL_IN_EE_DIR` in `jh_else_ce/lib/utils/url_utility`'
199+
no-restricted-properties: off
194200
no-unsanitized/method: off
195201
no-unsanitized/property: off
196202
local-rules/require-valid-help-page-path: off

‎.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ variables:
219219
DOCS_REVIEW_APPS_DOMAIN: "docs.gitlab-review.app"
220220
DOCS_GITLAB_REPO_SUFFIX: "ee"
221221

222-
REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:gcloud-383-kubectl-1.27-helm-3.9"
222+
REVIEW_APPS_IMAGE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/${BUILD_OS}-${OS_VERSION}-ruby-${RUBY_VERSION}:gcloud-383-kubectl-1.28-helm-3.9"
223223
REVIEW_APPS_DOMAIN: "gitlab-review.app"
224224
REVIEW_APPS_GCP_PROJECT: "gitlab-review-apps"
225225
REVIEW_APPS_GCP_REGION: "us-central1"

‎.rubocop_todo/rspec/context_wording.yml

-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,6 @@ RSpec/ContextWording:
369369
- 'ee/spec/lib/gitlab/insights/finders/issuable_finder_spec.rb'
370370
- 'ee/spec/lib/gitlab/insights/project_insights_config_spec.rb'
371371
- 'ee/spec/lib/gitlab/legacy_github_import/project_creator_spec.rb'
372-
- 'ee/spec/lib/gitlab/search/aggregation_parser_spec.rb'
373372
- 'ee/spec/lib/gitlab/sitemaps/url_extractor_spec.rb'
374373
- 'ee/spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb'
375374
- 'ee/spec/lib/gitlab/status_page/filter/image_filter_spec.rb'

‎.rubocop_todo/rspec/feature_category.yml

-1
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,6 @@ RSpec/FeatureCategory:
678678
- 'ee/spec/lib/gitlab/reference_extractor_spec.rb'
679679
- 'ee/spec/lib/gitlab/regex_spec.rb'
680680
- 'ee/spec/lib/gitlab/return_to_location_spec.rb'
681-
- 'ee/spec/lib/gitlab/search/aggregation_parser_spec.rb'
682681
- 'ee/spec/lib/gitlab/search/aggregation_spec.rb'
683682
- 'ee/spec/lib/gitlab/search/client_spec.rb'
684683
- 'ee/spec/lib/gitlab/search/recent_epics_spec.rb'

‎.rubocop_todo/rspec/named_subject.yml

-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@ RSpec/NamedSubject:
457457
- 'ee/spec/lib/gitlab/patch/draw_route_spec.rb'
458458
- 'ee/spec/lib/gitlab/proxy_spec.rb'
459459
- 'ee/spec/lib/gitlab/reference_extractor_spec.rb'
460-
- 'ee/spec/lib/gitlab/search/aggregation_parser_spec.rb'
461460
- 'ee/spec/lib/gitlab/search/aggregation_spec.rb'
462461
- 'ee/spec/lib/gitlab/search/client_spec.rb'
463462
- 'ee/spec/lib/gitlab/search_context/builder_spec.rb'

‎Gemfile

+14-9
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ gem 'neighbor', '~> 0.3.2', feature_category: :duo_chat
5959

6060
gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
6161

62-
gem 'faraday', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory
62+
gem 'faraday', '~> 2', feature_category: :shared
63+
gem 'faraday-retry', '~> 2', feature_category: :shared
6364
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
6465

6566
# Authorization
@@ -116,7 +117,7 @@ gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:t
116117
gem 'validates_hostname', '~> 1.0.13' # rubocop:todo Gemfile/MissingFeatureCategory
117118
gem 'rubyzip', '~> 2.3.2', require: 'zip' # rubocop:todo Gemfile/MissingFeatureCategory
118119
# GitLab Pages letsencrypt support
119-
gem 'acme-client', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
120+
gem 'acme-client', '~> 2.0.18' # rubocop:todo Gemfile/MissingFeatureCategory
120121

121122
# Browser detection
122123
gem 'browser', '~> 5.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -146,7 +147,7 @@ gem 'graphql', '~> 2.3.5', feature_category: :api
146147
gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
147148
gem 'graphiql-rails', '~> 1.10', feature_category: :api
148149
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
149-
gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import)
150+
gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
150151

151152
# Generate Fake data
152153
gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -177,7 +178,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory
177178
# We may want to update this dependency if this is ever addressed upstream, e.g. via
178179
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
179180
gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory
180-
gem 'gitlab-fog-azure-rm', '~> 1.9.1', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory
181+
gem 'gitlab-fog-azure-rm', '~> 2.0.1', require: 'fog/azurerm', feature_category: :shared
181182

182183
# for Google storage
183184

@@ -205,14 +206,16 @@ gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
205206
gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
206207

207208
# Search
208-
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
209-
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
210-
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
209+
gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
210+
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
211+
gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
211212
gem 'aws-sdk-core', '~> 3.200.0' # rubocop:todo Gemfile/MissingFeatureCategory
212213
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
213214
gem 'aws-sdk-s3', '~> 1.155.0' # rubocop:todo Gemfile/MissingFeatureCategory
214-
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
215-
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
215+
gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
216+
gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
217+
# Used with Elasticsearch to support http keep-alive connections
218+
gem 'typhoeus', '~> 1.4.0', feature_category: :global_search
216219

217220
# Markdown and HTML processing
218221
gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning
@@ -569,6 +572,8 @@ group :test do
569572
end
570573

571574
gem 'octokit', '~> 9.0', feature_category: :importers
575+
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
576+
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
572577

573578
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
574579

0 commit comments

Comments
 (0)