GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2020-07-09T15:39:38Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2811WIP: Prepare 9.5.3-ee release2020-07-09T15:39:38ZJose Ivan Vargas LopezWIP: Prepare 9.5.3-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/37347
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.3-ee`) by merging `9-5-stable-ee-patch-3` into `9-5-stable-ee`.
### MR Filter for ~"Pick into...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/37347
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.3-ee`) by merging `9-5-stable-ee-patch-3` into `9-5-stable-ee`.
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.5&scope=all&sort=updated_asc&state=merged
### MR Filter for ~"Pick into Backports" MRs
As well as picking merge requests explicitly marked for this release, you'll need to check those which need to be included in backports. Some ~"Pick into Backports" MRs won't be relevant for this release, or will have already been included; because of this you'll need to read the discussion on each MR below to decide if to include them:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Backports&scope=all&sort=updated_asc&state=merged
### Note to leave in MRs
```
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2811, will merge into `9-5-stable-ee` ready for `9.5.3-ee`
/unlabel ~"Pick into Stable"
```
### Steps
1. Cherry-pick commits into this MR using the links for ~"Pick into Stable" and ~"Pick into Backports" above.
- This can be done by checking out `9-5-stable-ee-patch-3` locally and using `git cherry-pick -m1 MERGE_COMMIT_SHA`
1. Push changes every so often and verify that the MR has been included
1. Leave a note in the MR so others can easily see that it is on track to be included in a release.
- If the MR no longer needs to be cherry-picked into further releases, remove the ~"Pick into Stable" label.
- Otherwise update the milestone to the highest release it needs to be picked into, and set ~"Pick into Backports" if it needs to be picked into other releases in addition to that one.
1. If there are any conflicts while picking MRs then attempt to resolve them; otherwise, create a new MR against the `9-5-stable-ee-patch-3` branch and assign it to the author of the conflicting files.
1. Merge CE-to-EE using one of the workflows described in the [Merge CE stable changes to EE docs](https://gitlab.com/gitlab-org/release-tools/blob/master/doc/picking-into-merge-requests.md#merge-ce-stable-changes-to-ee)
1. Once this MR is green merge it to stable, preferably with a manual fast-forward merge to minimize waiting time, as described in [Merging preparation MRs into stable](https://gitlab.com/gitlab-org/release-tools/blob/master/doc/picking-into-merge-requests.md#merging-preparation-mrs-into-stable)
### Checklist
- [ ] Changes marked ~"Pick into Stable" have been picked
- [ ] Changes marked ~"Pick into Backports" have been picked
- [ ] CE->EE merge has taken place
- [ ] Conflicts resolved
- [ ] No new commits have introduced directly to the stable branch while this MR was in progress. If there are, check for a green pipeline after merging this MR.9.5Jose Ivan Vargas LopezJose Ivan Vargas Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2772Limit Geo LogCursor spec to run only on PostgreSQL2020-07-09T15:39:38ZStan HuLimit Geo LogCursor spec to run only on PostgreSQLIt's not clear why this spec was failing on https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/30356856, but it shouldn't be run in MySQL in any case.It's not clear why this spec was failing on https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/30356856, but it shouldn't be run in MySQL in any case.10.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1961License plan check on namespaces2020-07-09T15:39:39ZOswaldo FerreirLicense plan check on namespacesAddresses #2019
- Create helper methods for checking feature availability for namespaces
- Put 'File locks' and 'Deploy board' under namespace license check
- Allow checking features by using symbols instead plain long strings (e.g...Addresses #2019
- Create helper methods for checking feature availability for namespaces
- Put 'File locks' and 'Deploy board' under namespace license check
- Allow checking features by using symbols instead plain long strings (e.g. `:file_lock`, `:deploy_board`)
- Add namespace API for admin usage9.4Oswaldo FerreirOswaldo Ferreirhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2974Only run Geo backfill for projects on healthy shards2020-07-09T15:39:39ZNick ThomasOnly run Geo backfill for projects on healthy shards## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](htt...## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [x] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by Backend
- [x] Conform by the [merge request performance guides](https://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #336010.1Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/498Update changelogs2020-07-09T15:39:40ZValery SizovUpdate changelogs8.10Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1948Get 9 2 stable ee green2020-07-09T15:39:41Zusername-removed-408677Get 9 2 stable ee green## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs....## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1970Resolve "Update "merge request" icon in MR approval notifications"2020-07-09T15:39:43Zusername-removed-636429Resolve "Update "merge request" icon in MR approval notifications"## What does this MR do?
Updates the merge request icon within the "MR approval" email notifications to match the icon used elsewhere in GitLab.
### Before/After
![Screen_Shot_2017-05-23_at_5.12.11_PM](/uploads/4aa5a4f8e83e1d7c3...## What does this MR do?
Updates the merge request icon within the "MR approval" email notifications to match the icon used elsewhere in GitLab.
### Before/After
![Screen_Shot_2017-05-23_at_5.12.11_PM](/uploads/4aa5a4f8e83e1d7c31afc4e8691275cf/Screen_Shot_2017-05-23_at_5.12.11_PM.png)
Closes #19699.3Annabel GrayAnnabel Grayhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1965Move docs 'superpowers' items to their respective sections2020-07-09T15:39:44ZAchilleas PipinellisMove docs 'superpowers' items to their respective sections## What does this MR do?
Don't mention superpowers in `doc/README.md`.## What does this MR do?
Don't mention superpowers in `doc/README.md`.9.3https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/499Remove .form-horizontal from git hooks page2020-07-09T15:39:44ZAnnabel GrayRemove .form-horizontal from git hooks pageFix vertical alignment of git-hooks page
![Screen_Shot_2016-06-23_at_10.34.06_AM](/uploads/aadc7d24238daad3bee3f748e5391b87/Screen_Shot_2016-06-23_at_10.34.06_AM.png)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18730Fix vertical alignment of git-hooks page
![Screen_Shot_2016-06-23_at_10.34.06_AM](/uploads/aadc7d24238daad3bee3f748e5391b87/Screen_Shot_2016-06-23_at_10.34.06_AM.png)
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/187308.9Jacob SchatzJacob Schatzhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/394Bump GitLab Pages to 0.2.42020-07-09T15:39:44ZKamil TrzcińśkiBump GitLab Pages to 0.2.4This fixes 404 Content-Type that were supposed to be fixed last time.
cc @axil @dblessing
This fixes 404 Content-Type that were supposed to be fixed last time.
cc @axil @dblessing
8.7yorickpeterse-stagingyorickpeterse-staginghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1967Add missing UX for "License features applied to Groups or individuals"2020-07-09T15:39:45Zusername-removed-636429Add missing UX for "License features applied to Groups or individuals"## What does this MR do?
- Adds badges to the admin dashboard user and group indexes indicating whether that user or group is a part of a plan.
- Adds a field to the admin dashboard show user and show group pages indicating the selected...## What does this MR do?
- Adds badges to the admin dashboard user and group indexes indicating whether that user or group is a part of a plan.
- Adds a field to the admin dashboard show user and show group pages indicating the selected plan
| group index | user index | group show |
| ---- | ---- | ---- |
| ![Screen_Shot_2017-05-23_at_3.15.05_PM](/uploads/7df0c4ec1eb3dcacac03574f982d2395/Screen_Shot_2017-05-23_at_3.15.05_PM.png) | ![Screen_Shot_2017-05-23_at_3.12.04_PM](/uploads/c707de69636c7ebd7b4e944213a5e699/Screen_Shot_2017-05-23_at_3.12.04_PM.png) | ![Screen_Shot_2017-05-23_at_3.45.44_PM](/uploads/e962451145769ee426bc2bec2272a348/Screen_Shot_2017-05-23_at_3.45.44_PM.png) |
## Does this MR meet the acceptance criteria?
- ~~[ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary~~
- ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)~~
- ~~[ ] API support added~~
- Tests
- ~~[ ] Added for this feature/bug~~
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Related to: #20199.3Annabel GrayAnnabel Grayhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1974Replace last added wait_for_vue_resource by wait_for_requests2020-07-09T15:39:45ZOswaldo FerreirReplace last added wait_for_vue_resource by wait_for_requestsReplace last added `wait_for_vue_resource` by `wait_for_requests`Replace last added `wait_for_vue_resource` by `wait_for_requests`Oswaldo FerreirOswaldo Ferreirhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2037Clean up Protected branches EE tests, removing unnecessary to_sym usage2020-07-09T15:39:46ZJames EJClean up Protected branches EE tests, removing unnecessary to_sym usage## What
Refactoring in protected branches tests
## Why
* Technical debt
* Keeps code similar to protected tags
## Related
Suggested in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1629#note_28100955
Closes #2...## What
Refactoring in protected branches tests
## Why
* Technical debt
* Keeps code similar to protected tags
## Related
Suggested in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1629#note_28100955
Closes #2586 Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2089Make the revision on the `/help` page clickable2020-07-09T15:41:48ZToon ClaesMake the revision on the `/help` page clickable## What does this MR do?
_EE MR for gitlab-org/gitlab-ce!12016_
For quicker access, add hyperlink to the gitlab.com commits page for the current
REVISION of GitLab.
## Screenshots (if relevant)
![image](https://gitlab.com/gi...## What does this MR do?
_EE MR for gitlab-org/gitlab-ce!12016_
For quicker access, add hyperlink to the gitlab.com commits page for the current
REVISION of GitLab.
## Screenshots (if relevant)
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cab409e52d38b1571fff6b3f29ce1573/image.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
_none_9.4Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2094EE Version of 9-2-5 Master security update2020-07-09T15:41:48ZDJ MountneyEE Version of 9-2-5 Master security update## What does this MR do?
This is the EE counterpart to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12025
With the included test fix from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2078
This MR, in additi...## What does this MR do?
This is the EE counterpart to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12025
With the included test fix from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2078
This MR, in addition to https://gitlab.com/gitlab-org/gitlab-ee/commit/df0b99e25efbb53cd1d43915ad1c6002f1f9fd5e
should represent the entire 9.2.5 security fixes
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
9.3Kamil TrzcińśkiKamil Trzcińśkihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2122Merge RC2 into 9.3 (actually-stable)2020-07-09T15:41:49Zusername-removed-408677Merge RC2 into 9.3 (actually-stable)## Checklist
Please refer to https://gitlab.com/gitlab-org/gitlab-ce/snippets/1664866 for the diff changes when check the files below
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob...## Checklist
Please refer to https://gitlab.com/gitlab-org/gitlab-ce/snippets/1664866 for the diff changes when check the files below
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/javascripts/issue_show/components/edited.vue
- [x] @timothyandrew please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/javascripts/notes.js
- [x] @brycepj please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
- [x] @ClemMakesApps please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/javascripts/users_select.js
- [x] @brycepj please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/stylesheets/framework/sidebar.scss
- [x] @psimyn please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/assets/stylesheets/pages/merge_requests.scss
- [x] @rspeicher please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/controllers/autocomplete_controller.rb
- [x] @iamphill please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/controllers/projects/issues_controller.rb
- [x] @iamphill please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/helpers/application_helper.rb
- [x] @ayufan please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/commit_status.rb
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/concerns/editable.rb
- [x] @smcgivern please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/concerns/elastic/application_search.rb
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/concerns/issuable.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/note.rb
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/models/snippet.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/policies/project_snippet_policy.rb
- [x] @dbalexandre please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/services/geo/repository_sync_service.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/uploaders/file_uploader.rb
- [x] @ayufan please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/app/uploaders/gitlab_uploader.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/config/routes/uploads.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/db/migrate/20170316163800_rename_system_namespaces.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/db/migrate/20170316163845_move_uploads_to_system_dir.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/db/post_migrate/20170317162059_update_upload_paths_to_system.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/db/post_migrate/20170406111121_clean_upload_symlinks.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/db/post_migrate/20170606202615_move_appearance_to_system_dir.rb
- [x] @nick.thomas please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/doc/ci/README.md
- [x] @eReGeBe please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/doc/development/README.md
- [x] @JobV please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/doc/user/admin_area/settings/usage_statistics.md
- [x] @SeanPackham (GitLab) please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/doc/user/project/issues/img/issues_main_view_numbered.png
- [x] @brycepj please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/features/project/merge_requests/accept.feature
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/features/steps/groups.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/features/steps/profile/profile.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/features/steps/project/project.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/base_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/commit_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/commit_range_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/external_issue_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/label_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/merge_request_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/milestone_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/snippet_parser.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/banzai/reference_parser/user_parser.rb
- [x] @smcgivern please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/gitlab/elastic/search_results.rb
- [x] @timothyandrew please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/gitlab/regex.rb
- [x] @smcgivern please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/lib/gitlab/uploads_transfer.rb
- [x] @rspeicher please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/scripts/static-analysis
- [x] @smcgivern please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/elastic_integration/global_search_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/factories/uploads.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/admin/admin_appearance_spec.rb
- [x] @ClemMakesApps please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/issues/form_spec.rb
- [x] @brycepj please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
- [x] @godfat please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/security/project/private_access_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/uploads/user_uploads_avatar_to_group_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/helpers/application_helper_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/helpers/emails_helper_spec.rb
- [x] @timothyandrew please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/helpers/groups_helper_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/helpers/page_layout_helper_spec.rb
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/javascripts/issue_show/components/edited_spec.js
- [x] @timothyandrew please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/javascripts/notes_spec.js
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/javascripts/vue_shared/components/commit_spec.js
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/lib/banzai/reference_parser/base_parser_spec.rb
- [x] @selfup please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/lib/banzai/reference_parser/snippet_parser_spec.rb
- [x] @smcgivern please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/lib/gitlab/uploads_transfer_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/migrations/clean_upload_symlinks_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/migrations/move_uploads_to_system_dir_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/migrations/rename_system_namespaces_spec.rb
- [x] @kushalpandya please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/migrations/update_retried_for_ci_builds_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/migrations/update_upload_paths_to_system_spec.rb
- [x] @tiagonbotelho please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/models/application_setting_spec.rb
- [x] @lbennett please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/models/concerns/editable_spec.rb
- [x] oswaldo please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/models/license_spec.rb
- [x] @mkozono please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/models/merge_request_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/models/namespace_spec.rb
- [x] @ayufan please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/services/geo/repository_sync_service_spec.rb
- [x] @ClemMakesApps please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/support/prometheus_helpers.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/uploaders/attachment_uploader_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/uploaders/avatar_uploader_spec.rb
- [x] @DouweM please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/uploaders/file_uploader_spec.rb
- [x] @mkozono please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/workers/admin_emails_worker_spec.rb
- [x] @nick.thomas please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/workers/project_cache_worker_spec.rb
- [x] @mkozono please make sure this file looks correct https://gitlab.com/gitlab-org/gitlab-ee/blob/9-3-actually-stable-ee-rc2/spec/workers/update_all_mirrors_worker_spec.rb
If any files need to be modified, please push (no force-push!) to the `9-3-actually-stable-ee-rc2` branch.
## Steps taken
1. `git merge -Xtheirs 86051969bd10f2c75540add61424aa12bb21e265` (https://gitlab.com/gitlab-org/gitlab-ee/commit/088eab2d420d29836a5f136e3ac98edf29e9bf15)
2. timeline.scss was missing a brace, so I fixed it in (https://gitlab.com/gitlab-org/gitlab-ee/commit/6eec80fe718f01bd534f0a084ca352f538a5a259)
Step 1 also led to:
```
deleted by them: app/assets/javascripts/issue_show/issue_title_description.vue
deleted by them: app/assets/javascripts/projects/settings_service_desk/service_desk_root.js
deleted by them: app/workers/geo_backfill_worker.rb
deleted by them: spec/javascripts/commit/pipelines/mock_data.js
deleted by them: spec/javascripts/issue_show/issue_title_description_spec.js
deleted by them: spec/support/wait_for_vue_resource.rb
deleted by them: spec/workers/geo/geo_backfill_worker_spec.rb
deleted by them: spec/workers/repository_update_mirror_dispatch_worker_spec.rb
```
3. So I removed those files in https://gitlab.com/gitlab-org/gitlab-ee/commit/c0175b1a3b7a955b41b67d515df45692fc8105b4
4. Found a missing `end` in a spec (bad merge conflict), so it got fixed in https://gitlab.com/gitlab-org/gitlab-ee/commit/3bcabf1fb606492f19394db8b27b4b1069555dc2
5. Removed duplicate prometheus_ping_url as seen in commit
6. Remove duplicate key in graph_component.vue
7. Fix bad merge of users_select.js
8. Cherry pick https://gitlab.com/gitlab-org/gitlab-ee/commit/c86d9e1026250c7fa0d69d20319854d9f6101b16username-removed-408677username-removed-408677https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2096Port Resolve "Rename settings panel "close" action to "collapse" to avoid con...2020-07-09T15:41:49Zusername-removed-636429Port Resolve "Rename settings panel "close" action to "collapse" to avoid confusion" to EEPort of gitlab-ce!12027 to EE
related: gitlab-ce#30378, gitlab-ce#33489Port of gitlab-ce!12027 to EE
related: gitlab-ce#30378, gitlab-ce#334899.3Annabel GrayAnnabel Grayhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2116Fix conflicts for 9.2.6 CE->EE merge2020-07-09T15:41:49Zusername-removed-407765Fix conflicts for 9.2.6 CE->EE merge## Conflicts
- [x] @lbennett / @iamphill: fix app/assets/javascripts/dispatcher.js
- [x] @fatihacet / @brycepj: fix app/assets/javascripts/vue_merge_request_widget/dependencies.js
- [x] @ClemMakesApps / @DouweM: fix app/controllers/auto...## Conflicts
- [x] @lbennett / @iamphill: fix app/assets/javascripts/dispatcher.js
- [x] @fatihacet / @brycepj: fix app/assets/javascripts/vue_merge_request_widget/dependencies.js
- [x] @ClemMakesApps / @DouweM: fix app/controllers/autocomplete_controller.rb
- [x] @ayufan / @grzesiek: fix app/models/project_services/kubernetes_service.rb
- [x] @vsizov / @smcgivern: fix app/services/issuable_base_service.rb
- [x] @brycepj / @fatihacet: fix app/views/shared/issuable/form/_merge_params.html.haml
- [x] @ClemMakesApps / @iamphill: fix spec/features/issues/form_spec.rb (fixed by merging in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2088)
- [x] @ayufan / @grzesiek: spec/models/project_services/kubernetes_service_spec.rb
- [x] @vsizov / @rymai: fix spec/models/user_spec.rb9.2https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2127Add docs for personal access tokens2020-07-09T15:41:49ZAchilleas PipinellisAdd docs for personal access tokens## What does this MR do?
CE port https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12128/diffs## What does this MR do?
CE port https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12128/diffs9.3https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2103Add additional user actions in Audit events2020-07-09T15:41:49ZJames LopezAdd additional user actions in Audit eventsAdds the additional user events (this does not change the underlying current audit mechanism)
Different approach from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1927
- Add a new email address
- Remove an email address
...Adds the additional user events (this does not change the underlying current audit mechanism)
Different approach from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1927
- Add a new email address
- Remove an email address
- Password change
- Forget password
- Failed to login
- Add SSH key
- Grant Oauth access
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/1370
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)10.1Grzegorz BizonGrzegorz Bizon