Commit graph

259043 commits

Author SHA1 Message Date
Miguel Rincon 92b40a041e Merge branch 'justin_ho-remove-legacy-mount-component-helper-in-sidebar' into 'master'
Replace `mountComponent` helper in `vue_shared/components/sidebar` specs

See merge request gitlab-org/gitlab!73459
2021-11-09 18:02:14 +00:00
Justin Ho Tuan Duong ad8017defd Replace mountComponent helper in vue_shared/components/sidebar specs 2021-11-09 18:02:14 +00:00
Andrejs Cunskis 245b3021ce Merge branch '10io-fix-helm-qa-specs-location' into 'master'
Move the helm registry QA spec to the proper location

See merge request gitlab-org/gitlab!74086
2021-11-09 17:55:07 +00:00
Robert Speicher 2632e2ac65 Merge branch 'kassio/github-importer-thread-diff-notes' into 'master'
GithubImporter: Thread diff notes

See merge request gitlab-org/gitlab!73595
2021-11-09 17:49:35 +00:00
Jose Ivan Vargas f168c39659 Merge branch 'mle/keyboard-shortcut-menu-style' into 'master'
Use kbd styling for keyboard shortcut hints

See merge request gitlab-org/gitlab!73141
2021-11-09 17:44:06 +00:00
Andreas Brandl 41d9ac9e69 Merge branch '343955-improve-database-partitioning-tests' into 'master'
Improve Gitlab::Database::Partitioning tests

See merge request gitlab-org/gitlab!74036
2021-11-09 17:42:35 +00:00
Stan Hu e5a6cc3a7e Merge branch 'nmezzopera-increase-capybara-screenshots-filenames-length' into 'master'
Increase Capybara screenshots filenames length

See merge request gitlab-org/gitlab!73832
2021-11-09 17:40:57 +00:00
Nicolò Maria Mezzopera 7a22a61837 Increase Capybara screenshots filenames length 2021-11-09 17:40:57 +00:00
Kamil Trzciński 717a101022 Fix after code review
Fix `#process_sql` and invalid
comment.
2021-11-09 18:32:06 +01:00
Suzanne Selhorn cf550fb5fa Merge branch 'msj-api-template' into 'master'
Update sorting guidance in API doc template

See merge request gitlab-org/gitlab!74087
2021-11-09 17:32:05 +00:00
Suzanne Selhorn e407b0fc2c Merge branch 'kpaizee-omniauth-ctrt-part-1' into 'master'
OmniAuth CTRT edits part 1

See merge request gitlab-org/gitlab!73870
2021-11-09 17:10:33 +00:00
Kati Paizee a32e84e12f OmniAuth CTRT edits part 1 2021-11-09 17:10:31 +00:00
Robert Speicher 4372e59bd0 Merge branch '343037_fix_store_report_service_finding_lookup_logic' into 'master'
Fix store report service finding lookup logic and override uuids service

See merge request gitlab-org/gitlab!73563
2021-11-09 17:08:51 +00:00
Bob Van Landuyt 93e981f644 Merge branch '331697-tracer-3-metrics-tracer' into 'master'
Step 3 - Add MetricsTracer to Graphql Schema

See merge request gitlab-org/gitlab!73820
2021-11-09 17:08:24 +00:00
Paul Slaughter 3eaf18fcfd Step 3 - Add MetricsTracer to Graphql Schema 2021-11-09 17:08:23 +00:00
Mario Celi a3569025ba
Fix scoped board milestone/iteration Timebox global ID
When a milestone or iteration Timebox id was used in a
scoped board the global ID for that milestone or iteration
would not preserve the correct format
Example: "gid://gitlab/Milestone/-1", "gid://gitlab/Iteration/-4"

Changelog: fixed
EE: true
2021-11-09 12:07:02 -05:00
Paul Slaughter 34bc3fe041 Merge branch 'afontaine/add-required-to-release' into 'master'
Add required label to tag name in release form

See merge request gitlab-org/gitlab!73759
2021-11-09 17:05:05 +00:00
Markus Koller e00a6996e7 Merge branch '332288-use-defaults-for-ssl-config' into 'master'
Use default Rails SSL configuration values

See merge request gitlab-org/gitlab!74040
2021-11-09 16:55:22 +00:00
Max Woolf 60e759e3b9 Move EE::AuditEvent specs to correct location 2021-11-09 16:38:04 +00:00
Amy Qualls 8f419ff774 Merge branch 'msj-confidential-epic' into 'master'
Update steps to make an epic confidential

See merge request gitlab-org/gitlab!74103
2021-11-09 16:36:24 +00:00
Suzanne Selhorn 2bc7d02e08 Merge branch 'docs-improve-deprecation-notice-manag-proj' into 'master'
Docs: Add the current options to the deprecation notice

See merge request gitlab-org/gitlab!74094
2021-11-09 16:35:21 +00:00
Suzanne Selhorn 80098f9a65 Merge branch 'docs-wildcard-path-tweak' into 'master'
Clarify details about the wildcard paths

See merge request gitlab-org/gitlab!73901
2021-11-09 16:33:50 +00:00
Marcel Amirault d88b08c158 Clarify details about the wildcard paths 2021-11-09 16:33:50 +00:00
Vasilii Iakliushin 988dc4aeb0 Reject multiple PGP signatures for commits
Contributes to https://gitlab.com/gitlab-org/gitlab/-/issues/25616

**Problem**

It is possible to attach multiple PGP signatures to the commit. But
git does not support that (see:
da6cf1b336).

**Solution**

Reject multiple PGP signatures for commits (even if they valid ones)
to match `git verify-commit` behavior.

Show an error message to describe why we mark commit as unverified.
2021-11-09 17:33:25 +01:00
Kamil Trzciński 99cc0e4058 Make QueryAnalyzers to hold a state and hook to middleware
One of the problems of QueryAnalyzers is that their state
is evaluated each time. This is problematic for various reasons
as we need to re-evaluate feature flags, or other dynamic conditions.

This makes QueryAnalyzers behavior sticky. The enabled flag is checked
exactly once for each request/worker/spec. If it resolves to true,
the query analyzer will be enabled for the whole execution of a job.

This makes also QueryAnalyzer to hold a context that is set/reset
on boundaries of job execution.
2021-11-09 17:32:42 +01:00
Kamil Trzciński d09f8d12d4 Ensure that QueryAnalyzer handles recursive calls
It is possible that Query Analyzer to unintentionally
trigger SQL query. To prevent Stack Too Deep discover
recursive calls and prevent them.
2021-11-09 17:32:09 +01:00
Kamil Trzciński 352a17b058 Use Singleton module
This ensures that always only a single instance
of a given class can be created.
2021-11-09 17:30:47 +01:00
Lin Jen-Shin 72aab7402b Move code in initializers to module for reusing 2021-11-10 00:28:25 +08:00
Doug Stull 0c23443fb8
Add section for permanent experiment implementation concerns
- good place for follow-up if implementing
2021-11-09 11:26:26 -05:00
Mikołaj Wawrzyniak 0b7ca3c3ae Merge branch 'feature/integration_shimo/model' into 'master'
Shimo integration: part of models

See merge request gitlab-org/gitlab!73621
2021-11-09 16:24:08 +00:00
Baodong 29eb045b58 Shimo integration: part of models 2021-11-09 16:24:06 +00:00
Marcin Sedlak-Jakubowski 797ab4d16d Update steps to make an epic confidential 2021-11-09 16:22:18 +00:00
Fiona Neill dc5164a737 Merge branch 'aqualls-move-internal-api-page' into 'master'
Move internal API page into its own subdirectory

See merge request gitlab-org/gitlab!74097
2021-11-09 16:21:34 +00:00
Amy Qualls 4d0f3ca4ef Move internal API page into its own subdirectory 2021-11-09 16:21:33 +00:00
Amy Qualls e2ee03df45 Merge branch 'msj-manage-epics' into 'master'
Edit Manage epics page for style

See merge request gitlab-org/gitlab!74080
2021-11-09 16:15:12 +00:00
Tetiana Chupryna c084ac4b65 Merge branch 'pl-error-tracking-length-validation' into 'master'
Add length validations for error tracking errors and events

See merge request gitlab-org/gitlab!74012
2021-11-09 16:09:30 +00:00
Terri Chu 45f4b2ce80 Merge branch 'storage-counter-add-pipeline-artifacts' into 'master'
Add pipeline artifacts size to admin area project statistics

See merge request gitlab-org/gitlab!72216
2021-11-09 15:56:23 +00:00
Olena Horal-Koretska 695876e5a6 Merge branch 'renovate/gitlab-uisvg' into 'master'
Update dependency @gitlab/ui to v32.36.0

See merge request gitlab-org/gitlab!73857
2021-11-09 15:50:03 +00:00
Mehmet Emin INAC 243602b9bf
Do not send parsing errors to Sentry as they are not exceptions 2021-11-09 16:44:22 +01:00
Kassio Borges 2b6b33c4bf GithubImporter: Thread diff notes
Enable threaded diff notes to be migrated as discussions to GitLab.

Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/336596

MR:
Changelog: added
2021-11-09 15:41:41 +00:00
Paul Slaughter 2fa3c81a89
Add support for jh/jest.config.js 2021-11-09 09:29:43 -06:00
Etienne Baqué dd2554bcb1 Merge branch '341486-corpus-fetch-query' into 'master'
Graphql query- fetch corpus

See merge request gitlab-org/gitlab!72793
2021-11-09 15:28:15 +00:00
Aditya Tiwari 8d36828dc0 Graphql query- fetch corpus 2021-11-09 15:28:14 +00:00
Steve Abrams af9efed71e Add read_at to dependency proxy objects
Add a read_at column to dependency_proxy_manifests
and dependency_proxy_blobs to be used for more
accurate TTL policy logic.

Update the Dependency Proxy TTL worker to use the
new read_at column when qualifying objects for
expiration.

Changelog: changed
2021-11-09 08:23:22 -07:00
Piotr Skorupa 8a9e51b0cd Revert PseudonymizationHelper catch-all 2021-11-09 16:22:39 +01:00
Piotr Skorupa eaffe45efd Revert insights page URL masking handler 2021-11-09 16:22:37 +01:00
Amy Qualls 705a27e046 Merge branch 'hchouraria-docs-rebase-author-of-commit-no-approval' into 'master'
Add note about rebasing preventing approvals

See merge request gitlab-org/gitlab!74035
2021-11-09 15:21:37 +00:00
Harsh Chouraria a5aafc7a51 Add note about rebasing preventing approvals 2021-11-09 15:21:36 +00:00
Terri Chu 28cf5c88d9 Merge branch 'fix-error-reporting-go' into 'master'
Fix error reporting for Go

See merge request gitlab-org/gitlab!72050
2021-11-09 15:18:53 +00:00
Ethan Reesor ed024893d7 Fix error reporting for Go 2021-11-09 15:18:53 +00:00