GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2020-09-21T12:28:13Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3093Simplify project page- EE version2020-09-21T12:28:13ZAnnabel GraySimplify project page- EE versionEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14669EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1466910.1Annabel GrayAnnabel Grayhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3092Cleanup old nav stuff- EE version2021-09-17T19:10:21ZAnnabel GrayCleanup old nav stuff- EE versionEE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14573EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1457310.1Filipa Lacerdafilipa@gitlab.comFilipa Lacerdafilipa@gitlab.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3090Add comma delimiters to make Geo Node status more readable2017-10-07T00:06:32ZStan HuAdd comma delimiters to make Geo Node status more readableBefore:
![image](/uploads/ef6be630229948f5ecc1331404ecf23e/image.png)
After:
![image](/uploads/a85e656cb4fc34afdc133afaf95a6b38/image.png)Before:
![image](/uploads/ef6be630229948f5ecc1331404ecf23e/image.png)
After:
![image](/uploads/a85e656cb4fc34afdc133afaf95a6b38/image.png)10.1username-removed-408677username-removed-408677https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3070EE port of flash-es6-module2017-10-05T17:02:51ZPhil Hughesme@iamphill.comEE port of flash-es6-moduleEE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14626EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14626https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2912WIP: Resolve "Saved configuration for issue board"2017-10-09T04:06:35ZSimon KnoxWIP: Resolve "Saved configuration for issue board"## What does this MR do?
Saved config for issue boards - #2518
Add an 'Edit board' button to EE Issue Boards to filter by Milestone, Assignee, Labels or Weight
**Todo**, approximately in order of importance
### Frontend
...## What does this MR do?
Saved config for issue boards - #2518
Add an 'Edit board' button to EE Issue Boards to filter by Milestone, Assignee, Labels or Weight
**Todo**, approximately in order of importance
### Frontend
- [ ] update milstone_select spec, add spec for other form elements
- [ ] show placeholder text when board filters are applied
### Backend
- [x] update assignee, labels and weight when _adding_ an issue to a board (if they're present on the board)
- [x] update assignee, labels and weight when _creating_ an issue within a list
- [x] when “Removing from board” (one issue), clean Assignee, Labels and Weight (if they're present on the board)
- [x] Check `feature_available?(:scoped_issue_board)` checks only filtering-out `milestone_id` param
- [x] Check if users and labels being returned on board config work accordingly for group boards
- [x] Remove author from board (will not go for this release)
- [ ] Address comments
### Extras
- [ ] Update docs (it was extended to other fields) -> http://localhost:3001/help/user/project/issue_board.html#board-with-a-milestone
- [ ] Unlicensed user cannot see "View board" button
- [ ] Complete feature tests (ongoing)
- [ ] "No Milestone" filter is not working
- [ ] "No weight" / "Any weight" filter is not working
### Broken pipelines
- [ ] https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/35117442
- [ ] https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/35113132
- [ ] https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/35113903
- [ ] https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/35113093
- [ ] https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/35112207
## Are there points in the code the reviewer needs to double check?
## Screenshots (if relevant)
## 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
- [ ] 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 #251810.1Simon KnoxSimon Knoxhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2875WIP: Add service desk feature highlight2020-07-09T15:51:21Zusername-removed-408677WIP: Add service desk feature highlight## What does this MR do?
Adds feature highlight for service desk
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
~Deliverable
## Screenshots (if relevant)
## Doe...## What does this MR do?
Adds feature highlight for service desk
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
~Deliverable
## 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?
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/3212https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2855show horizontal scrollbar on issue boards in focus mode2020-07-09T15:15:33ZSimon Knoxshow horizontal scrollbar on issue boards in focus mode## What does this MR do?
Fix height of issue boards in focus mode so the horizontal scrollbar is visible
Topbar height is 70px, not 50
## Are there points in the code the reviewer needs to double check?
## Screenshots (if relevant)
...## What does this MR do?
Fix height of issue boards in focus mode so the horizontal scrollbar is visible
Topbar height is 70px, not 50
## Are there points in the code the reviewer needs to double check?
## Screenshots (if relevant)
![Screen_Shot_2017-09-07_at_5.12.18_pm](/uploads/f889feb75b6bcb6b590419df1aae39d7/Screen_Shot_2017-09-07_at_5.12.18_pm.png)
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- Tests
- [ ] 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 #268010.0Simon KnoxSimon Knoxhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2468Apply mergable scss rules with conflicts.2020-07-09T16:34:53Zusername-removed-408230Apply mergable scss rules with conflicts.## 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?
EE Compatible Version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12810https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2159Resolve "Approval appears to still be required after merge"2020-07-09T15:15:21ZLuke "Jared" BennettResolve "Approval appears to still be required after merge"## What does this MR do?
Allows MR widget approval component to update in _realtime_.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![2017-06-18...## What does this MR do?
Allows MR widget approval component to update in _realtime_.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![2017-06-18_02.35.16](/uploads/6c5f6a10fec8cd717fe8caa97da62999/2017-06-18_02.35.16.gif)
## 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?
Closes #2600https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1416WIP: Fix merge request approval layout2020-07-09T16:51:58Zusername-removed-636429WIP: Fix merge request approval layoutUtilizes the newly-created `mailer.html.haml` template for the header and footer of merge request approve/unapprove email notifications since they are identical in this case. Also allows these notification emails to take advantage of th...Utilizes the newly-created `mailer.html.haml` template for the header and footer of merge request approve/unapprove email notifications since they are identical in this case. Also allows these notification emails to take advantage of the custom branding feature added in gitlab-ce!9049.
Fixes #1898
See also: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9049#note_23966476
I will open a MR in gitlab CE to backport the changes in 5db2f07a9.0username-removed-636429username-removed-636429