GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2020-07-09T16:06:25Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2784Replace SidebarHeightManager by CSS rules2020-07-09T16:06:25ZWinnie HellmannReplace SidebarHeightManager by CSS rulesThis is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13736/.
## What does this MR do?
Remove `SidebarHeightManager` and use CSS rules instead.
## Why was this MR needed?
Too many factors influenced the sidebar h...This is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13736/.
## What does this MR do?
Remove `SidebarHeightManager` and use CSS rules instead.
## Why was this MR needed?
Too many factors influenced the sidebar height leading to several regressions.
## Screenshots
![new-bulk-issue-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6bf1619d0f83cf914af5c53043cceca6/new-bulk-issue-sidebar.mp4)
![new-issue-board-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/569ee122ce6f8cbe3bf4c2afbad7369a/new-issue-board-sidebar.mp4)
![new-issue-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/656fa920f2ce22f0c23d1344e4333230/new-issue-sidebar.mp4)
![new-job-sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2277404c95f102dd6d9fb8bfe7f49068/new-job-sidebar.mp4)
## What are the relevant issue numbers?
fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36447, fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/36635, fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/368559.5Winnie HellmannWinnie Hellmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2862Removes default scope from sortable2020-07-09T16:06:24Zusername-removed-117638Removes default scope from sortable**EE Compatibility**
with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13558**EE Compatibility**
with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1355810.0username-removed-117638username-removed-117638https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1955Change pipelines schedules help page path2020-07-09T15:39:39ZAchilleas PipinellisChange pipelines schedules help page path## What does this MR do?
From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11592.
I also cherry-picked https://gitlab.com/gitlab-org/gitlab-ee/commit/5655ff0feeaa76524dafbac982ec96cbf18e9e20 since it's not yet picked into ...## What does this MR do?
From CE https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11592.
I also cherry-picked https://gitlab.com/gitlab-org/gitlab-ee/commit/5655ff0feeaa76524dafbac982ec96cbf18e9e20 since it's not yet picked into stable.9.2Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1943Fix 9.2 conflicts for "Update docs for multiple assignees"2020-07-09T15:39:38Zusername-removed-407765Fix 9.2 conflicts for "Update docs for multiple assignees"- Encountered conflicts while picking !1940 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
### Output of `git status` after failed merge
```
On branch 9-2-stable-ee
Your branch is up-to-date ...- Encountered conflicts while picking !1940 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
### Output of `git status` after failed merge
```
On branch 9-2-stable-ee
Your branch is up-to-date with 'origin/9-2-stable-ee'.
You are currently cherry-picking commit 5bf3e7c.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by us: doc/user/project/issues/issues_functionalities.md
no changes added to commit (use "git add" and/or "git commit -a")
```
/cc @ClemMakesApps @selfup9.2Victor WuVictor Wuhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1681Small refactoring of the user cohorts docs2020-07-09T15:39:19ZAchilleas PipinellisSmall refactoring of the user cohorts docs- Use H2 headings for the nested sections
- Create an Overview section- Use H2 headings for the nested sections
- Create an Overview section9.1Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1088Fix repository size reporting2020-07-09T15:37:52ZStan HuFix repository size reportingThe previous code intended to use the repository size, not the size
of the storage volume, for the total space used by the repository.
The side effect was that the repository size limits were always failing
in staging.The previous code intended to use the repository size, not the size
of the storage volume, for the total space used by the repository.
The side effect was that the repository size limits were always failing
in staging.8.16Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3048WIP: Resolve "Issues in sub group boards have the incorrect link"2017-10-04T13:57:26ZLuke "Jared" BennettWIP: Resolve "Issues in sub group boards have the incorrect link"## What does this MR do?
Accounts for subgroups in the EE boards issue link base generation.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![Scr...## What does this MR do?
Accounts for subgroups in the EE boards issue link base generation.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
![Screen_Shot_2017-10-03_at_02.47.09](/uploads/709d78d1b7ac87c7f40acfa6b63210b2/Screen_Shot_2017-10-03_at_02.47.09.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)
## What are the relevant issue numbers?
Closes #356210.0Luke "Jared" BennettLuke "Jared" Bennetthttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3002Add order by next execution timestamp to mirrors to sync2017-09-22T14:14:32Zusername-removed-117638Add order by next execution timestamp to mirrors to sync## What does this MR do?
Mirrors were not being picked up by `next_execution_timestamp` order which means it would not matter how old you were.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab....## What does this MR do?
Mirrors were not being picked up by `next_execution_timestamp` order which means it would not matter how old you were.
## 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.0username-removed-117638username-removed-117638https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2940Fixing reference to current_application_settings2017-09-16T13:47:32Zusername-removed-305091david.andrew.mckay@gmail.comFixing reference to current_application_settings## What does this MR do?
Fixes #3465
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Bugfix
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
- [x] ...## What does this MR do?
Fixes #3465
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Bugfix
## Screenshots (if relevant)
N/A
## 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
- [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
- [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?
#346510.0https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2648EE port of fixed-sticky-stats-box-commit-view2017-09-14T01:04:15ZPhil Hughesme@iamphill.comEE port of fixed-sticky-stats-box-commit-viewEE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13343EE port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/133439.5Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2329Update PostgreSQL HA alpha document for repmgr automation2017-09-04T10:56:38ZIan BaumUpdate PostgreSQL HA alpha document for repmgr automationSee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Update PG HA alpha documentation to reflect the current state of documentation
Closes gitlab-org/omnibus...See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Update PG HA alpha documentation to reflect the current state of documentation
Closes gitlab-org/omnibus-gitlab#25729.5Marin JankovskiMarin Jankovskihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2723Fix testing of Jenkins integration2017-08-22T07:51:33ZRubén DávilaFix testing of Jenkins integration## What does this MR do?
Fix the testing of Jenkins integration that was broken due to we weren't creating the Service/ServiceHook records.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?...## What does this MR do?
Fix the testing of Jenkins integration that was broken due to we weren't creating the Service/ServiceHook records.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Users were unable to test their Jenkins integration
## 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 #31949.5Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2633Disable Ajax request for GPG status on repository page2017-08-14T20:02:20ZWinnie HellmannDisable Ajax request for GPG status on repository pageThis is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13337 (which admittedly has a much nicer ID).
## What does this MR do?
Load GPG status of last commit synchronously on repository page.
## Screenshots
...This is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13337 (which admittedly has a much nicer ID).
## What does this MR do?
Load GPG status of last commit synchronously on repository page.
## Screenshots
| Before | After |
| --- | --- |
| ![Screen_Shot_2017-08-07_at_14.17.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6b22011c477c4f3eb16f36bafcae3926/Screen_Shot_2017-08-07_at_14.17.58.png) | ![Screen_Shot_2017-08-07_at_14.16.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ddcf7190102e6242a79494b880982c22/Screen_Shot_2017-08-07_at_14.16.41.png) |
| ![Screen_Shot_2017-08-07_at_19.19.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12fb3969e416a23c99c763c42e54bb7d/Screen_Shot_2017-08-07_at_19.19.34.png) | ![Screen_Shot_2017-08-07_at_19.17.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94ee4966926c59c68b9158f86c7fc3fa/Screen_Shot_2017-08-07_at_19.17.39.png) |
## What are the relevant issue numbers?
fixes #35699, #360469.5Winnie HellmannWinnie Hellmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2163Add dependencies fix2017-08-10T18:17:20ZKamil TrzcińśkiAdd dependencies fixThis is backported CE fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12113 that did not get picked into RC3 stable.This is backported CE fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12113 that did not get picked into RC3 stable.9.3kushalpandyakushalpandyahttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2516Don't treat anonymous users as owners when group has pending invites2017-07-25T12:19:25Zusername-removed-443319Don't treat anonymous users as owners when group has pending invitesEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13037. (That's already merged - there is a spec failure on EE when picking it, not a merge conflict.)EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13037. (That's already merged - there is a spec failure on EE when picking it, not a merge conflict.)9.4Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/748CE: Cycle Analytics (First Iteration)2017-07-07T18:53:09Zusername-removed-407765CE: Cycle Analytics (First Iteration)- Associated CE merge request: gitlab-org/gitlab-ce!5986
/cc @stanhu @DouweM- Associated CE merge request: gitlab-org/gitlab-ce!5986
/cc @stanhu @DouweM8.12username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2188WIP: Fix unmergedStates for merge request widget2017-06-21T06:54:06ZWinnie HellmannWIP: Fix unmergedStates for merge request widget## What does this MR do?
Repair `unmergedStates` in the merge request widget which got broken after CE &rarr; EE merge.
## What are the relevant issue numbers?
fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/33999## What does this MR do?
Repair `unmergedStates` in the merge request widget which got broken after CE → EE merge.
## What are the relevant issue numbers?
fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/339999.3Winnie HellmannWinnie Hellmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/675Fix inputs not being found due to incorrect class in wrap element2017-06-19T14:48:02Zusername-removed-408881Fix inputs not being found due to incorrect class in wrap elementFixes failing specFixes failing spec8.11https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1767WIP: Resolve "Navigation menu bugs on the "Contribution Analytics" page"2017-05-02T10:51:40ZLuke "Jared" BennettWIP: Resolve "Navigation menu bugs on the "Contribution Analytics" page"## What does this MR do?
Fixes "contribution analytics" nav item not being `active` and showing the "settings" subnav when active.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
...## What does this MR do?
Fixes "contribution analytics" nav item not being `active` and showing the "settings" subnav when active.
## 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?
Closes #23069.1Luke "Jared" BennettLuke "Jared" Bennetthttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1021Fix cross-project references copy to include the project reference2017-01-03T16:47:07ZJames LopezFix cross-project references copy to include the project referenceEE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8232 to fix any merge conflicts / specs.EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8232 to fix any merge conflicts / specs.8.15username-removed-443319username-removed-443319