GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-10-05T16:49:58Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3047WIP: Use case-insensitive lookup for Kerberos Spnego identity.2017-10-05T16:49:58ZDrew BlessingWIP: Use case-insensitive lookup for Kerberos Spnego identity.## What does this MR do?
Clients can send the Kerberos username/principal in any case - the
Kerberos server itself does not care. However, GitLab stores
the Kerberos username/principal as extern_uid in a case-sensitive
format. This...## What does this MR do?
Clients can send the Kerberos username/principal in any case - the
Kerberos server itself does not care. However, GitLab stores
the Kerberos username/principal as extern_uid in a case-sensitive
format. This change uses an `iwhere` statement rather than
`find_by` so it doesn't matter how the client send the
username/principal.
## Are there points in the code the reviewer needs to double check?
Should we have specs for this? Where? There isn't a clear place to put specs for this helper class.
## Why was this MR needed?
It was causing inability to authenticate for a customer in https://gitlab.zendesk.com/agent/tickets/82669
## 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] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [x] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [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)10.1Drew BlessingDrew Blessinghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3046Fix i18n namespace typo2017-10-03T07:42:56ZJames RamsayFix i18n namespace typoFixes a typo in the namespace reported by the community.
![image](/uploads/2822686442ebbc0907937a015a6d6f1e/image.png)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/change...Fixes a typo in the namespace reported by the community.
![image](/uploads/2822686442ebbc0907937a015a6d6f1e/image.png)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3045WIP: Prepare 9.5.7-ee release2017-11-22T00:10:12ZJose Ivan Vargas LopezWIP: Prepare 9.5.7-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38686
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.7-ee`) by merging `9-5-stable-ee-patch-7` into `9-5-stable-ee`.
### MR Filter for ~"Pick into Stabl...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38686
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.7-ee`) by merging `9-5-stable-ee-patch-7` 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/MERGE_REQUEST_ID, will merge into `9-5-stable-ee` ready for `9.5.7-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-7` 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-7` 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/3044Added possibility to enter past date in /spend command to log time in the past2020-07-09T15:39:39Zusername-removed-238711Added possibility to enter past date in /spend command to log time in the past## What does this MR do?
Provides feature to enter date in /spend command to logging time in the past. In UI there was added date when time was spent like on a screenshot.
Example: '/spend 10m 2017-02-02'.
Acceptable formats of date: ...## What does this MR do?
Provides feature to enter date in /spend command to logging time in the past. In UI there was added date when time was spent like on a screenshot.
Example: '/spend 10m 2017-02-02'.
Acceptable formats of date: long: YYYY-MM-DD, short: YY-M-D or mixes of this.
Acceptable delimiters: '-' '/' '.' and few variants of delimiters mixes but i highly not recommend this
![image](/uploads/772e8939ac9b0f2d2adf80f9f2de354b/image.png)
- [x] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [x] Tests added for this feature/bug
- [ ] 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)
Issue #1312 username-removed-238711username-removed-238711https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3043Add static analysis job to find invalid YAML in changelogs2017-10-02T10:05:12Zusername-removed-443319Add static analysis job to find invalid YAML in changelogsEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14518.EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14518.10.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3042Clarifying restore instructions.2017-10-03T22:39:43Zusername-removed-1215240Clarifying restore instructions.See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Clarifying restore instructions regarding the behavior when a backup directory is not explicitly set and the re...See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Clarifying restore instructions regarding the behavior when a backup directory is not explicitly set and the requirements for the name of a restore file.
## Moving docs to a new location?
See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location
- [x] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [x] Make sure internal links pointing to the document in question are not broken.
- [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [x] If working on CE, submit an MR to EE with the changes as well.https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3041Fix EE delta size check handling with annotated tags 12021-03-23T07:21:57ZStan HuFix EE delta size check handling with annotated tags 1Pushes with annotated tags would fail when the repository size limits were enabled.
Closes #3589Pushes with annotated tags would fail when the repository size limits were enabled.
Closes #35899.5Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3040Fix the lock-yourself-out prevention code and spec for Geo2017-10-03T12:46:26ZNick ThomasFix the lock-yourself-out prevention code and spec for Geo## What does this MR do?
Geo is supposed to prevent you from adding the primary node to the database as a secondary. However, the validation implementing this was not running, and the spec was broken too.
## Are there points in the...## What does this MR do?
Geo is supposed to prevent you from adding the primary node to the database as a secondary. However, the validation implementing this was not running, and the spec was broken too.
## 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 #350610.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3039Prepare 10.0.3-ee release2017-10-04T08:28:00ZRobert SpeicherPrepare 10.0.3-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38544
### Summary
This MR prepares `10-0-stable-ee` for %"10.0" (`10.0.3-ee`) by merging `10-0-stable-ee-patch-3` into `10-0-stable-ee`.
### MR Filter for ~"Pick...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38544
### Summary
This MR prepares `10-0-stable-ee` for %"10.0" (`10.0.3-ee`) by merging `10-0-stable-ee-patch-3` into `10-0-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=10.0&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/3039, will merge into `10-0-stable-ee` ready for `10.0.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 `10-0-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 `10-0-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.10.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3038(EE) Create repositories via Gitaly2017-10-02T11:10:28ZJacob Vosmaer (GitLab)(EE) Create repositories via Gitaly## What does this MR do?
GitLab-EE counterpart to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14566
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant...## What does this MR do?
GitLab-EE counterpart to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14566
## 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/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?10.1Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3037EE Port of "Remove edit action for issues"2017-10-03T14:18:08ZJarka Kadlecovajarka@gitlab.comEE Port of "Remove edit action for issues"EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14523EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1452310.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3036CE upstream: Friday2017-10-02T16:49:39Zusername-removed-423915CE upstream: Friday* [x] both modified: app/assets/javascripts/boards/components/board_new_issue.js
* [x] both modified: app/finders/users_finder.rb
* [x] both modified: app/services/merge_requests/merge_service.rb
* [x] both added: app/services...* [x] both modified: app/assets/javascripts/boards/components/board_new_issue.js
* [x] both modified: app/finders/users_finder.rb
* [x] both modified: app/services/merge_requests/merge_service.rb
* [x] both added: app/services/projects/hashed_storage_migration_service.rb
* [x] both modified: app/services/users/update_service.rb
* [x] both modified: config/sidekiq_queues.yml
* [x] both modified: doc/development/testing.md
* [x] both modified: doc/user/project/integrations/kubernetes.md
* [x] both modified: lib/api/api_guard.rb
* [x] both modified: lib/api/helpers.rb
* [x] both modified: lib/api/users.rb
* [x] both modified: lib/gitlab/git_access.rb
* [x] both modified: lib/gitlab/ldap/access.rb
* [x] both modified: locale/gitlab.pot
* [x] both modified: spec/factories/projects.rb
* [x] both modified: spec/lib/gitlab/shell_spec.rb
* [x] both modified: spec/models/project_spec.rb
* [x] both modified: spec/services/emails/destroy_service_spec.rb10.1username-removed-423915username-removed-423915https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3035Fix Ruby code for disabling Auto DevOps banner2017-10-02T06:17:07ZAthar HameedFix Ruby code for disabling Auto DevOps bannerSee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Fixes Ruby snippet for disabling Auto DevOps banner instance-wide.See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Fixes Ruby snippet for disabling Auto DevOps banner instance-wide.10.1Lee MatosLee Matoshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3034Adds a Gitaly n+1 notice to commit handling on access check2017-10-02T09:27:06Zusername-removed-367626Adds a Gitaly n+1 notice to commit handling on access check## What does this MR do?
Adds a Gitaly n+1 notice to commit handling on access check
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
It will prevent developers from hitting random er...## What does this MR do?
Adds a Gitaly n+1 notice to commit handling on access check
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
It will prevent developers from hitting random errors because of his, until we can solve the underlying n+1 issue.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitaly/issues/61710.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3033Makes code quality requests in parallel2017-09-29T13:23:08ZFilipa Lacerdafilipa@gitlab.comMakes code quality requests in parallel## What does this MR do?
Makes code quality requests in parallel
## Does this MR meet the acceptance criteria?
- Review
- [x] Has been reviewed by Frontend
- [x] Conform by the [merge request performance guides](https://docs.gitlab.c...## What does this MR do?
Makes code quality requests in parallel
## Does this MR meet the acceptance criteria?
- Review
- [x] Has been reviewed by Frontend
- [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 #291010.1Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3032Prepare 10.0.3-ee release2017-09-29T16:27:02ZRobert SpeicherPrepare 10.0.3-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38544
### Summary
This MR prepares `10-0-stable-ee` for %"10.0" (`10.0.3-ee`) by merging `10-0-stable-ee-patch-3` into `10-0-stable-ee`.
### MR Filter for ~"Pick...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38544
### Summary
This MR prepares `10-0-stable-ee` for %"10.0" (`10.0.3-ee`) by merging `10-0-stable-ee-patch-3` into `10-0-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=10.0&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/3032, will merge into `10-0-stable-ee` ready for `10.0.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 `10-0-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 `10-0-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.10.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3031WIP: Prepare 9.5.6-ee release2017-11-22T00:10:13ZJose Ivan Vargas LopezWIP: Prepare 9.5.6-ee releaseMain release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38529
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.6-ee`) by merging `9-5-stable-ee-patch-6` into `9-5-stable-ee`.
### MR Filter for ~"Pick into...Main release issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/38529
### Summary
This MR prepares `9-5-stable-ee` for %"9.5" (`9.5.6-ee`) by merging `9-5-stable-ee-patch-6` 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/3031, will merge into `9-5-stable-ee` ready for `9.5.6-ee`
/unlabel ~"Pick into Backports"
```
### 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-6` 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-6` 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/3030New Crowdin translations2020-12-03T10:31:39ZGitLab Crowdin BotNew Crowdin translationsEnjoy!Enjoy!https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3029WIP: Refactor controller calls into services2020-09-08T17:33:01ZJames LopezWIP: Refactor controller calls into servicesFixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3544
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/do...Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3544
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/doc_styleguide.html)
- [ ] API support added
- [ ] Tests added for this feature/bug
- Review
- [ ] Has been reviewed by UX
- [ ] Has been reviewed by Frontend
- [ ] Has been reviewed by Backend
- [ ] Has been reviewed by Database
- [ ] Conform by the [merge request performance guides](https://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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3028Fix heading for group issue boards2017-09-28T12:48:24ZAchilleas PipinellisFix heading for group issue boards## What does this MR do?
Remove `-level` from group issue boards heading in docs.
Relevant https://gitlab.com/gitlab-com/www-gitlab-com/issues/1663## What does this MR do?
Remove `-level` from group issue boards heading in docs.
Relevant https://gitlab.com/gitlab-com/www-gitlab-com/issues/166310.1username-removed-236961username-removed-236961