Commits · e377022a540d88ad998ce4d1a32839304aa21e03 · nexedi / gitlab-ce

24 Nov, 2021 40 commits
- Merge branch 'selhorn-updated-build-cloud-to-saas' into 'master' · e377022a
  Amy Qualls authored Nov 24, 2021
```
Updated Build cloud to SaaS runners

See merge request gitlab-org/gitlab!74749
```
  e377022a
- Updated Build cloud to SaaS runners · f6ecf497
  Suzanne Selhorn authored Nov 24, 2021
  
  f6ecf497
- Merge branch 'dj-add-409-to-users-api' into 'master' · 12845cd2
  Amy Qualls authored Nov 24, 2021
```
Add 409 Conflict return doc

See merge request gitlab-org/gitlab!75124
```
  12845cd2
- Add 409 Conflict return doc · 6219dd07
  Dan Davison authored Nov 24, 2021
  
  6219dd07
- Merge branch 'cdybenko-master-patch-86437' into 'master' · ff7e74fe
  Marcin Sedlak-Jakubowski authored Nov 24, 2021
```
Add Planning Hierarchy to the docs

See merge request gitlab-org/gitlab!74927
```
  ff7e74fe
- Add Planning Hierarchy to the docs · 12384578
  Christen Dybenko authored Nov 24, 2021
  
  12384578
- Merge branch '338350-enable-deduplication-ff-by-default' into 'master' · 3f63c0eb
  Sean McGivern authored Nov 24, 2021
```
Enable FF preserve_latest_wal_locations_for_idempotent_jobs by default

See merge request gitlab-org/gitlab!74902
```
  3f63c0eb
- Merge branch 'cngo-make-iteration-cadences-dry' into 'master' · 07ae35d8
  Jose Ivan Vargas authored Nov 24, 2021
```
Make iteration cadence code DRY

See merge request gitlab-org/gitlab!75104
```
  07ae35d8
- Make iteration cadence code DRY · 7583b286
  Coung Ngo authored Nov 24, 2021
  
  7583b286
- Merge branch 'mw-move-vsa-menu-item-to-top' into 'master' · 83b69787
  Douglas Barbosa Alexandre authored Nov 24, 2021
```
Move Value stream to top-level in analytics section of left sidebar nav

See merge request gitlab-org/gitlab!74686
```
  83b69787
- Move Value stream to top-level in analytics section of left sidebar nav · 14c1e9e9
  Martin Wortschack authored Nov 24, 2021
  
  14c1e9e9
- Merge branch 'mc/manual-job-retry-copy-variables' into 'master' · faac2d38
  Douglas Barbosa Alexandre authored Nov 24, 2021
```
Copy variables when retrying job

See merge request gitlab-org/gitlab!75042
```
  faac2d38
- Merge branch 'increase-rspec-parallelization' into 'master' · 5a7c1941
  Rémy Coutable authored Nov 24, 2021
```
ci: Increase parallelization of RSpec unit and integration jobs

See merge request gitlab-org/gitlab!74878
```
  5a7c1941
- Merge branch 'gy-update-pg-replication-failover-docs' into 'master' · a0ce1efd
  Grant Young authored Nov 24, 2021
```
Update Postgres docs to reflect new Database LB guidance

See merge request gitlab-org/gitlab!74611
```
  a0ce1efd
- Update Postgres docs to reflect new Database LB guidance · f12a2f91
  Grant Young authored Nov 24, 2021
  
  f12a2f91
- Merge branch 'mw/handle-scoped-actors-ff-event-streaming-rollout' into 'master' · f8530ad1
  Alex Pooley authored Nov 24, 2021
```
Fix audit event streaming rollout actors

See merge request gitlab-org/gitlab!74513
```
  f8530ad1
- Fix audit event streaming rollout actors · 3237f57a
  Max Woolf authored Nov 24, 2021
  
  3237f57a
- Merge branch 'eread/move-and-edit-multiple-ldap-servers-content' into 'master' · fd700992
  Suzanne Selhorn authored Nov 24, 2021
```
Move multiple LDAP servers content and edit for CTRT

See merge request gitlab-org/gitlab!75062
```
  fd700992
- Move multiple LDAP servers content and edit for CTRT · d720a95b
  Evan Read authored Nov 24, 2021
  
  d720a95b
- Merge branch 'mo-fix-database-cross-join-in-lib-gitlab-application_context-rb' into 'master' · 7352e14e
  Marius Bobin authored Nov 24, 2021
```
Fix database cross-join in ApplicationContext

See merge request gitlab-org/gitlab!75086
```
  7352e14e
- Fix database cross-join in ApplicationContext · 9d091555
  Maxime Orefice authored Nov 24, 2021
  
  9d091555
- Merge branch 'jh-372-jh-config-sidekiq-queues' into 'master' · 3bcba221
  Sean McGivern authored Nov 24, 2021
```
Add JH config for sidekiq queues

See merge request gitlab-org/gitlab!74666
```
  3bcba221
- Merge branch '323806-use-text-column' into 'master' · 72065e7b
  Douglas Barbosa Alexandre authored Nov 24, 2021
```
Geo - Use text to store failure messages

See merge request gitlab-org/gitlab!75246
```
  72065e7b
- Use text now since Geo uses structure.sql · 6f88675d
  Douglas Barbosa Alexandre authored Nov 24, 2021
  
  6f88675d
- Merge branch '334917-change-wrench-icon-to-circle-dashed' into 'master' · 2a410860
  Peter Hegman authored Nov 24, 2021
```
Change remediated badge icon from wrench to check-circle-dashed

See merge request gitlab-org/gitlab!74689
```
  2a410860
- Merge branch 'sliding-list-partitioning-strategy' into 'master' · ef8c686a
  Tetiana Chupryna authored Nov 24, 2021
```
Sliding list partitioning strategy

See merge request gitlab-org/gitlab!73406
```
  ef8c686a
- Merge branch 'ag-improve-geo-verification-dev-docs' into 'master' · 07a3f810
  Douglas Barbosa Alexandre authored Nov 24, 2021
```
Add multiple improvements to Geo development docs

See merge request gitlab-org/gitlab!74865
```
  07a3f810
- Add multiple improvements to Geo development docs · f744779e
  Aakriti Gupta authored Nov 24, 2021
  
  f744779e
- Merge branch '345999-improve-pipeline-editor-test' into 'master' · 900de4d9
  Sanad Liaquat authored Nov 24, 2021
```
Improving pipeline editor E2E test

See merge request gitlab-org/gitlab!75046
```
  900de4d9
- Improving pipeline editor E2E test · cb8cc4ce
  Tiffany Rea authored Nov 24, 2021
  
  cb8cc4ce
- Merge branch '345477-resolve-multi-path-alias-for-webpack' into 'master' · ed1837e7
  Paul Slaughter authored Nov 24, 2021
```
Add some JH aliases for webpack and jest

See merge request gitlab-org/gitlab!74305
```
  ed1837e7
- Add jh_else_ee and any_else_ce support for webpack alias · d50c2000
  orozot authored Nov 24, 2021
```
- https://gitlab.com/gitlab-org/gitlab/-/issues/345477
- https://gitlab.com/gitlab-org/gitlab/-/merge_requests/74305
```
  d50c2000
- Merge branch '1334-use-redis-sessions-store' into 'master' · 0274e1f0
  Sean McGivern authored Nov 24, 2021
```
Use Redis session instance

See merge request gitlab-org/gitlab!74202
```
  0274e1f0
- Merge branch 'aqualls-ui-merge-conflicts' into 'master' · f0d69f67
  Miguel Rincon authored Nov 24, 2021
```
Provide better UI message for merge conflicts

See merge request gitlab-org/gitlab!74655
```
  f0d69f67
- Update UI message for merge conflicts · 650ef4e7
  Amy Qualls authored Nov 24, 2021
```
As part of reviewing our UI strings mentioning merge requests, this change updates the merge request message:

* OLD: "There are merge conflicts"
* NEW: "Merge blocked: merge conflicts must be resolved."

Changelog: changed
```
  650ef4e7
- Merge branch '345497-report-widgets-core-fix-collapse-button-border' into 'master' · 9bb39fdb
  Phil Hughes authored Nov 24, 2021
```
Report Widgets Core: Fix collapse button border

See merge request gitlab-org/gitlab!75229
```
  9bb39fdb
- Report Widgets Core: Fix collapse button border · 535b898f
  Jiaan Louw authored Nov 24, 2021
  
  535b898f
- Merge branch '340778-fix-go17-zip-range-requests' into 'master' · 586f9162
  Jacob Vosmaer authored Nov 24, 2021
```
Update workhorse's zipartifacts to work with Go 1.17

See merge request gitlab-org/gitlab!72780
```
  586f9162
- Merge branch '346327-remove-admin-services-js' into 'master' · 5a257ad2
  Miguel Rincon authored Nov 24, 2021
```
Remove javascripts/pages/admin/services directory

See merge request gitlab-org/gitlab!75174
```
  5a257ad2
- Merge branch '292018-packages-list-update-the-pipeline-metadata' into 'master' · 9b97b05d
  Miguel Rincon authored Nov 24, 2021
```
Fetch only the last pipeline on package list

See merge request gitlab-org/gitlab!74994
```
  9b97b05d