Commits · 443695e97421d5223eac9fbdc24cdccdec196f37 · nexedi / gitlab-ce

23 Apr, 2021 40 commits
- Merge branch 'dblessing_fix_cascading_locked_method' into 'master' · 443695e9
  Michael Kozono authored Apr 23, 2021
```
Add ability to include self in cascading setting lock check

See merge request gitlab-org/gitlab!60031
```
  443695e9
- Add ability to include self in cascading setting lock check · 10298a1d
  Drew Blessing authored Apr 23, 2021
  
  10298a1d
- Merge branch 'jivanvl-enable-gldropdown-tags-ff' into 'master' · adac6df7
  Scott Hampton authored Apr 23, 2021
```
Enable gldropdown_tags feature flag

See merge request gitlab-org/gitlab!60145
```
  adac6df7
- Merge branch 'Externalise-strings-in-appearances_form.html.haml' into 'master' · 5e065738
  Scott Hampton authored Apr 23, 2021
```
Externalise strings in appearances/_form.html.haml

See merge request gitlab-org/gitlab!58135
```
  5e065738
- Use i18n in appearances/_form.html.haml · 6e029740
  Marvin Karegyeya authored Apr 23, 2021
```
Externalise strings in appearances/_form.html.haml
```
  6e029740
- Merge branch '217872-audit-dast-events' into 'master' · 1785ee84
  Markus Koller authored Apr 23, 2021
```
Move DAST profile services into AppSec module

See merge request gitlab-org/gitlab!59896
```
  1785ee84
- Merge branch 'revert-dc5fd97b' into 'master' · 331bf2fa
  Mark Florian authored Apr 23, 2021
```
Reverts !59001 to fix a broken foss master [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!60144
```
  331bf2fa
- Merge branch '299265-rearrange-stage-event-methods' into 'master' · 7e0b67b7
  Michael Kozono authored Apr 23, 2021
```
Rearrange VSA stage event methods

See merge request gitlab-org/gitlab!60012
```
  7e0b67b7
- Merge branch '321812-prometheus-metrics' into 'master' · 33b50971
  Robert Speicher authored Apr 23, 2021
```
Update Usage Ping Metrics Definitions - Prometheus metrics

See merge request gitlab-org/gitlab!60013
```
  33b50971
- Merge branch 'release-tools/update-gitaly' into 'master' · 8638c533
  🤖 GitLab Bot 🤖 authored Apr 23, 2021
```
Update Gitaly version

See merge request gitlab-org/gitlab!60146
```
  8638c533
- Merge branch 'ag-327729-unlimited-users' into 'master' · 0c629940
  Scott Hampton authored Apr 23, 2021
```
SuperSonics: unlimited users

See merge request gitlab-org/gitlab!60127
```
  0c629940
- SuperSonics: unlimited users · 12ae35f8
  Angelo Gulina authored Apr 23, 2021
  
  12ae35f8
- Merge branch 'ab/inline-migrations' into 'master' · 19e25f5b
  Yannis Roussos authored Apr 23, 2021
```
Inline batched migrations only in dev env

See merge request gitlab-org/gitlab!60096
```
  19e25f5b
- Enable gldropdown_tags feature flag · 1f0481df
  Jose Vargas authored Apr 23, 2021
```
Changelog: changed
```
  1f0481df
- Merge branch '327013-draggable-comment-icon-for-multiline-comment-broken-on-firefox' into 'master' · 515f6181
  Jose Ivan Vargas authored Apr 23, 2021
```
Resolve "Draggable comment icon for multiline comment broken on Firefox"

See merge request gitlab-org/gitlab!58692
```
  515f6181
- Merge branch '239179-new-model-for-finding-evidences-response' into 'master' · 1a7b43b6
  Nick Thomas authored Apr 23, 2021
```
Add FindingEvidenceResponse model

See merge request gitlab-org/gitlab!59563
```
  1a7b43b6
- Add FindingEvidenceResponse model · 788b4ce3
  Jonathan Schafer authored Apr 23, 2021
  
  788b4ce3
- Update gitaly to b19cafa222f · eed788d1
  GitLab Release Tools Bot authored Apr 23, 2021
  
  eed788d1
- Revert "Merge branch 'jnnkl-refactor-manage-via-mr-to-shared-components' into 'master'" · 7b8b657c
  Kyle Wiebers authored Apr 23, 2021
```
This reverts merge request !59001
```
  7b8b657c
- Merge branch 'jh-add-issue-list-iteration-filters' into 'master' · 3ca18ac9
  Marcin Sedlak-Jakubowski authored Apr 23, 2021
```
Add iteration filters to issue lists API docs

See merge request gitlab-org/gitlab!60028
```
  3ca18ac9
- Merge branch 'remove-sentry-processors-flag' into 'master' · 9e7c4eaf
  Robert Speicher authored Apr 23, 2021
```
Remove sentry_processors_before_send feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!59565
```
  9e7c4eaf
- Remove sentry_processors_before_send feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS] · 6012b81c
  Sean McGivern authored Apr 23, 2021
  
  6012b81c
- Merge branch '296715-add-incident-column' into 'master' · 24ded9bb
  Andrew Fontaine authored Apr 23, 2021
```
Create incident column for threat alerts

See merge request gitlab-org/gitlab!59821
```
  24ded9bb
- Merge branch 'suggestion-author' into 'master' · 01ba92f9
  Robert Speicher authored Apr 23, 2021
```
Commit author for suggestions is note author

See merge request gitlab-org/gitlab!39940
```
  01ba92f9
- Merge branch 'dmishunov-scoped-feature-flag' into 'master' · 0fc28358
  Francisco Javier López authored Apr 23, 2021
```
Updated the project_sidebar_refactor flag

See merge request gitlab-org/gitlab!60112
```
  0fc28358
- Update test ids to be kebab case · 8abcb94f
  jboyson authored Apr 23, 2021
  
  8abcb94f
- Merge branch '327686-update-approvals-specs' into 'master' · 771c02d8
  Andrew Fontaine authored Apr 23, 2021
```
Update default branch name in approvals specs

See merge request gitlab-org/gitlab!59995
```
  771c02d8
- Merge branch '321812-cluster-metrics' into 'master' · df540313
  Nick Thomas authored Apr 23, 2021
```
Update Usage Ping Metrics - Cluster / Ops metrics

See merge request gitlab-org/gitlab!60025
```
  df540313
- Update Usage Ping Metrics - Cluster / Ops metrics · a31e828d
  David O'Regan authored Apr 23, 2021
  
  a31e828d
- Merge branch '225874-rubocop' into 'master' · cb4c0d5c
  Igor Drozdov authored Apr 23, 2021
```
Rubocop check for direct manipulation of ActiveModel errors hash

See merge request gitlab-org/gitlab!59971
```
  cb4c0d5c
- Rubocop check for direct manipulation of ActiveModel errors hash · ecf64c26
  Mark Chao authored Apr 23, 2021
  
  ecf64c26
- Merge branch 'add-missing-overrides' into 'master' · cd8d6688
  Heinrich Lee Yu authored Apr 23, 2021
```
Add missing overrides for ActiveSupportCacheStoreAdapter

See merge request gitlab-org/gitlab!60125
```
  cd8d6688
- Merge branch 'bbodenmiller-master-patch-21061' into 'master' · 60a7d0a6
  Achilleas Pipinellis authored Apr 23, 2021
```
Fix Enforcing 2FA for all users in a group version history

See merge request gitlab-org/gitlab!59057
```
  60a7d0a6
- Fix Enforcing 2FA for all users in a group version history · a0d2b3c2
  Ben Bodenmiller authored Apr 23, 2021
  
  a0d2b3c2
- Updated the project_sidebar_refactor flag · d6a73052
  Denys Mishunov authored Apr 23, 2021
```
- Renamed the flag to sidebar_refactor to reflect the
wider scope of the flag's action
- Scoped the flag to the user
```
  d6a73052
- Merge branch 'eread/add-group-assignments-to-api-docs' into 'master' · 823f4e83
  Craig Norris authored Apr 23, 2021
```
Add group assignments to API documentation

See merge request gitlab-org/gitlab!57784
```
  823f4e83
- Merge branch 'code-review-metrics-definition' into 'master' · 82a47b2e
  Nikola Milojevic authored Apr 23, 2021
```
Update code review metrics definitions

See merge request gitlab-org/gitlab!59816
```
  82a47b2e
- Update code review metrics definitions · fa7aad38
  Kai Armstrong authored Apr 23, 2021
  
  fa7aad38
- Merge branch 'tweak-new-changelog-suggestion' into 'master' · acf332a7
  Yorick Peterse authored Apr 23, 2021
```
Tweak Danger for the new changelog setup

See merge request gitlab-org/gitlab!60004
```
  acf332a7
- Merge branch 'dosc-remove-all-approval-rules' into 'master' · a69667f9
  Craig Norris authored Apr 23, 2021
```
Remove all for approval rules

See merge request gitlab-org/gitlab!60094
```
  a69667f9