GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2020-07-09T16:06:26Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2640Resolve "Rebase not working with forked projects in 9.4.2"2020-07-09T16:06:26Zusername-removed-443319Resolve "Rebase not working with forked projects in 9.4.2"## What does this MR do?
Fix rebasing when the MR is from a fork, and the upstream has the source branch protected (or you just can't push upstream anyway).
## Are there points in the code the reviewer needs to double check?
I c...## What does this MR do?
Fix rebasing when the MR is from a fork, and the upstream has the source branch protected (or you just can't push upstream anyway).
## Are there points in the code the reviewer needs to double check?
I can't do a real test for this, because we don't run hooks in the specs, because we'd need to run a server for them to hit the internal API :disappointed: I have tested it manually, however.
The other way to solve this would be to override `project` inside the `RebaseService`, but I think this is clearer.
## Why was this MR needed?
We broke something when fixing another bug :facepalm:
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- 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?
Closes #3071.9.4Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2123Resolve "Related Issues BE followup - Add public API"2020-07-09T15:42:05ZOswaldo FerreirResolve "Related Issues BE followup - Add public API"## What does this MR do?
Adds endpoints for _listing_, _creating_ and _deleting_ issue relations.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if n...## What does this MR do?
Adds endpoints for _listing_, _creating_ and _deleting_ issue relations.
## 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
- [ ] 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?
Closes #26339.4Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2684Create system notes only if issue was successfully related to another2020-07-09T15:39:38ZOswaldo FerreirCreate system notes only if issue was successfully related to another## What does this MR do?
Avoid system notes being created when Issue wasn't successfully related to another one.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/change...## What does this MR do?
Avoid system notes being created when Issue wasn't successfully related to another one.
## Does this MR meet the acceptance criteria?
- [x] [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
- [x] 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)
- [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?
Closes gitlab-ce#364439.4username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1901Fix linking to resolved note in diff -- EE merge edition2020-07-09T15:39:34Zusername-removed-892863contact@ericeastwood.comFix linking to resolved note in diff -- EE merge editionEE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327EE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/113279.2username-removed-502136username-removed-502136https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1873Fix flickering of system notes -- EE merge edition2020-07-09T15:39:34Zusername-removed-892863contact@ericeastwood.comFix flickering of system notes -- EE merge editionEE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11281EE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/112819.2Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1941Fix: Approvals not reset if changing target branch2020-07-09T15:39:34ZValery SizovFix: Approvals not reset if changing target branch## 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](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?
- [ ] [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://gitlab.com/gitlab-org/gitlab-ee/issues/21669.3Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2082Revert "Merge branch '2001-related-issues' into 'master'"2020-07-09T15:39:30Zusername-removed-443319Revert "Merge branch '2001-related-issues' into 'master'"Revert https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1719 as the frontend isn't ready, and we therefore don't want this in 9.3.Revert https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1719 as the frontend isn't ready, and we therefore don't want this in 9.3.9.3Oswaldo FerreirOswaldo Ferreirhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2035Resolve "Approvers don't appear when MR is created from a fork"2020-07-09T15:39:24Zusername-removed-443319Resolve "Approvers don't appear when MR is created from a fork"## What does this MR do?
Use the target project, not the source project, for getting project members for the MR approvers dropdown.
## Are there points in the code the reviewer needs to double check?
:shrug:
## Why was this ...## What does this MR do?
Use the target project, not the source project, for getting project members for the MR approvers dropdown.
## Are there points in the code the reviewer needs to double check?
:shrug:
## Why was this MR needed?
We accidentally broke this! When creating an MR from a fork, `@project` is the fork, not upstream.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
## What are the relevant issue numbers?
Closes #2556.9.2Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1391Resolve "Squash commits fails for branches named HEAD"2020-07-09T15:39:18Zusername-removed-443319Resolve "Squash commits fails for branches named HEAD"Closes #1861.
I'm not adding a spec, because I don't want to confuse people using the `gitlab-test` repo. I checked with @chriscool and this should refer to the 'current commit' HEAD, not the ref with the same name.
Demo:
![Squash_HEA...Closes #1861.
I'm not adding a spec, because I don't want to confuse people using the `gitlab-test` repo. I checked with @chriscool and this should refer to the 'current commit' HEAD, not the ref with the same name.
Demo:
![Squash_HEAD](/uploads/5f14080c3638ad0e63f8cd4f2214a028/Squash_HEAD.gif)9.1username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2205Normalise license MD5 values2020-07-09T15:25:46Zusername-removed-443319Normalise license MD5 values## What does this MR do?
Normalise license data before taking the MD5, so that hashes match those in the license app.
## Are there points in the code the reviewer needs to double check?
Does this seem reasonable? I don't think it need...## What does this MR do?
Normalise license data before taking the MD5, so that hashes match those in the license app.
## Are there points in the code the reviewer needs to double check?
Does this seem reasonable? I don't think it needs a changelog entry.
## Why was this MR needed?
License files uploaded in the UI always have newlines as separators, with a
single trailing newline.
Licenses pasted in the text box will have newlines replaced by \r\n by the
browser, and may have zero trailing newlines, or many.
Normalising these to a canonical form lets us match against the license app more
efficiently.
## Does this MR meet the acceptance criteria?
- 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?
Related to https://dev.gitlab.org/gitlab/license-app/merge_requests/59.9.4Rubén DávilaRubén Dávilahttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3061EE Port of "Lock discussion for issues and merge requests"2017-10-06T14:04:32ZJarka Kadlecovajarka@gitlab.comEE Port of "Lock discussion for issues and merge requests"ee port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14531ee port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1453110.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3064Don't create todos for old issue assignees2017-10-06T10:02:25ZJarka Kadlecovajarka@gitlab.comDon't create todos for old issue assignees## What does this MR do?
It creates Todos only for new assignees and not for the old ones.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
When issue assignees were changed we created a ...## What does this MR do?
It creates Todos only for new assignees and not for the old ones.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
When issue assignees were changed we created a new todo for all assignees including the ones that were already assigned to the issue.
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [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
- 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)
- [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 #364210.1username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3010Resolve "Navigating to another group board breaks navigation sidebar"2017-10-05T14:49:54ZLuke "Jared" BennettResolve "Navigating to another group board breaks navigation sidebar"## What does this MR do?
Stops the sidebar nav state resetting when switching boards.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![Oct-02-201...## What does this MR do?
Stops the sidebar nav state resetting when switching boards.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![Oct-02-2017_22-28-47](/uploads/f3380ef97fc1e5a9998cdb11e16ae850/Oct-02-2017_22-28-47.gif)
## 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?
Closes #339710.0Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2467Group issue boards2017-10-05T07:09:00ZFelipe ArturGroup issue boardscloses #928
closes #928
10.0username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2780Show errors when rebase onto target branch fails in the UI2017-10-04T13:44:10Zusername-removed-283999douglas@gitlab.comShow errors when rebase onto target branch fails in the UI![out](/uploads/58858a2f9089edf6e6fbe4d5c876a9b6/out.gif)
Fixes #1774![out](/uploads/58858a2f9089edf6e6fbe4d5c876a9b6/out.gif)
Fixes #177410.1username-removed-443319username-removed-443319https://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/2937Refactoring after moving fast-forward merge to CE2017-10-03T12:53:58ZValery SizovRefactoring after moving fast-forward merge to CE## What does this MR do?
We made fast-forward merge CE feature so that means that some code on EE side should be relocated and changed.
## Are there points in the code the reviewer needs to double check?
Yeah, maybe you know som...## What does this MR do?
We made fast-forward merge CE feature so that means that some code on EE side should be relocated and changed.
## Are there points in the code the reviewer needs to double check?
Yeah, maybe you know some other place that should be changed too.
## 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?
https://gitlab.com/gitlab-org/gitlab-ce/issues/2007610.1Valery SizovValery Sizovhttps://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/3027[CE backport] Clean merge_jid whenever necessary on the merge process2017-09-28T18:33:42ZOswaldo Ferreir[CE backport] Clean merge_jid whenever necessary on the merge processFurther explained on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14540Further explained on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1454010.0username-removed-443319username-removed-443319https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2923Fix MR ready to merge buttons/controls at mobile breakpoint -- EE merge edition2017-09-28T15:49:44Zusername-removed-892863contact@ericeastwood.comFix MR ready to merge buttons/controls at mobile breakpoint -- EE merge editionEE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14242EE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1424210.0username-removed-502136username-removed-502136