GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-06-27T01:29:03Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2241Geo: fix removal of repositories from disk on secondary nodes (Backport to 9.2)2017-06-27T01:29:03ZGabriel MazettoGeo: fix removal of repositories from disk on secondary nodes (Backport to 9.2)## What does this MR do?
Backports gitlab-org/gitlab-ee!2210 to %9.2
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
This is a critical fix for Geo, while we want people to always use ou...## What does this MR do?
Backports gitlab-org/gitlab-ee!2210 to %9.2
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
This is a critical fix for Geo, while we want people to always use our latest versions, we understand that there are reasons why people sometime keeps on the previous stable version for a while.
## 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?
* gitlab-org/gitlab-ee!2210
* gitlab-org/gitlab-ee#27019.2Gabriel MazettoGabriel Mazettohttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2145Refresh LDAP-users project authorizations on group sync2017-09-05T14:34:37ZBob Van Landuyt :neckbeard:Refresh LDAP-users project authorizations on group syncRefresh project authorizations when a user gets removed from an LDAP group.
Closes #2662
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passingRefresh project authorizations when a user gets removed from an LDAP group.
Closes #2662
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing9.2Stan HuStan Huhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2135Backport Geo: Dynamic Backoff strategy to 9 22020-07-09T15:41:49ZGabriel MazettoBackport Geo: Dynamic Backoff strategy to 9 2## What does this MR do?
Backports !2128 to %9.2
## Are there points in the code the reviewer needs to double check?
No, code is compatible with %9.2 codebase
## Why was this MR needed?
There are customers being hit by thi...## What does this MR do?
Backports !2128 to %9.2
## Are there points in the code the reviewer needs to double check?
No, code is compatible with %9.2 codebase
## Why was this MR needed?
There are customers being hit by this, see !2128 and gitlab-ee#2639
## 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?
- !2128
- gitlab-ee#26399.2Douwe MaanDouwe Maanhttps://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/2088Fix 9.2 conflicts for 'Resolve "Assignee dropdown does not display selected a...2020-07-09T15:41:49Zusername-removed-407765Fix 9.2 conflicts for 'Resolve "Assignee dropdown does not display selected assignee"'- Encountered conflicts while picking !1968 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @iamphill- Encountered conflicts while picking !1968 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @iamphill9.2username-removed-408677username-removed-408677https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2085Fix 9.2 conflicts for 'Resolve "Assignee dropdown does not display selected a...2017-07-07T18:53:08Zusername-removed-407765Fix 9.2 conflicts for 'Resolve "Assignee dropdown does not display selected assignee"'- Encountered conflicts while picking !1968 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @iamphill- Encountered conflicts while picking !1968 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @iamphill9.2username-removed-408677username-removed-408677https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2084Fix 9.2. conflicts for "Fix locked milestone in boards being remove-able - 9....2020-07-09T15:41:49Zusername-removed-407765Fix 9.2. conflicts for "Fix locked milestone in boards being remove-able - 9.2 merge edition"- Encountered conflicts while picking !1977 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
---
- https://gitlab.com/gitlab-org/gitlab-ee/blob/9339dec64edde53e562bbdc09678c38f2dfe3ccf/app/ass...- Encountered conflicts while picking !1977 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
---
- https://gitlab.com/gitlab-org/gitlab-ee/blob/9339dec64edde53e562bbdc09678c38f2dfe3ccf/app/assets/javascripts/filtered_search/filtered_search_manager.js
- https://gitlab.com/gitlab-org/gitlab-ce/blob/b4972c4b237ad270ad1a4054c2fe2439d60ee06d/app/assets/javascripts/filtered_search/filtered_search_manager.js
---
/cc @iamphill9.2Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2083Fix 9.2 conflicts for "Geo - Properly set tracking database connection and cr...2020-07-09T15:39:30Zusername-removed-407765Fix 9.2 conflicts for "Geo - Properly set tracking database connection and cron jobs on secondary node"- Encountered conflicts while picking !1987 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @rspeicher- Encountered conflicts while picking !1987 onto `9-2-stable-ee`
- Please fix the conflicts and merge this into `9-2-stable-ee`
/cc @rspeicher9.2https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2078WIP: Fix tests on `security-9-2-ee`2017-09-05T14:34:37Zusername-removed-642931git@selfup.meWIP: Fix tests on `security-9-2-ee`## What does this MR do?
Attempts to sync an EE specific security change that needs some CE magic to work.
9.2.2 - 9.2.5 EE security fix
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
...## What does this MR do?
Attempts to sync an EE specific security change that needs some CE magic to work.
9.2.2 - 9.2.5 EE security fix
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Sync security to public master
## What are the relevant issue numbers?
#331889.2https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2071Check if database_geo.yml exist before setting the tracking DB config2020-07-09T15:39:27Zusername-removed-283999douglas@gitlab.comCheck if database_geo.yml exist before setting the tracking DB configFixes #2603
/cc @adamniedzielskiFixes #2603
/cc @adamniedzielski9.2Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2053EE port of: "Fix incorrect ETag cache key when relative instance URL is used"2020-09-08T17:43:38Zusername-removed-378947EE port of: "Fix incorrect ETag cache key when relative instance URL is used"CE MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11964CE MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/119649.2username-removed-443319username-removed-443319https://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/2034re-add avatar url to approver avatar2017-09-05T14:34:37ZSimon Knoxre-add avatar url to approver avatar## What does this MR do?
include `avatar_url` prop
## Why was this MR needed?
broken in !2007
## Screenshots (if relevant)
![Screen_Shot_2017-06-06_at_12.15.19_am_copy](/uploads/33a3fb0c0b38bd9459f11f7e98e15fc7/Screen_Shot_2017-06-0...## What does this MR do?
include `avatar_url` prop
## Why was this MR needed?
broken in !2007
## Screenshots (if relevant)
![Screen_Shot_2017-06-06_at_12.15.19_am_copy](/uploads/33a3fb0c0b38bd9459f11f7e98e15fc7/Screen_Shot_2017-06-06_at_12.15.19_am_copy.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
- [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 #25609.2https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2031don't disable Rebase button for MR without Approvals2020-07-09T16:52:05ZSimon Knoxdon't disable Rebase button for MR without Approvals## What does this MR do?
## Are there points in the code the reviewer needs to double check?
Should this be picked into 9.1?
## Why was this MR needed?
~regression
## Screenshots (if relevant)
![Screen_Shot_2017-06-05_at_11.02.20_...## What does this MR do?
## Are there points in the code the reviewer needs to double check?
Should this be picked into 9.1?
## Why was this MR needed?
~regression
## Screenshots (if relevant)
![Screen_Shot_2017-06-05_at_11.02.20_pm_copy](/uploads/a232d2fcfcb923268e4df7e4e5bdc06b/Screen_Shot_2017-06-05_at_11.02.20_pm_copy.png)
## 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
- [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 #23859.2username-removed-502136username-removed-502136https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2014Ee fix kubernetes namespace2017-09-05T14:34:37ZKamil TrzcińśkiEe fix kubernetes namespace## What does this MR do?
Following the https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11653.
This is EE counterpart to fix merge conflict and failures for Kubernetes Service.
## Are there points in the code the reviewer needs t...## What does this MR do?
Following the https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11653.
This is EE counterpart to fix merge conflict and failures for Kubernetes Service.
## 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.2Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2007MR approval placeholders same size as images2017-09-05T14:34:37ZSimon KnoxMR approval placeholders same size as images## What does this MR do?
Fix Approvers layout bug
remove some unused styles (e.g. `> span` where span had changed)
## Are there points in the code the reviewer needs to double check?
- Are the circles correct size? They are big...## What does this MR do?
Fix Approvers layout bug
remove some unused styles (e.g. `> span` where span had changed)
## Are there points in the code the reviewer needs to double check?
- Are the circles correct size? They are bigger than the "available approvers" ones above, and smaller than the Pipeline status icons. That's a lot of different sized circles
- I moved SVG placeholder stuff into `link_to_member_avatar.js` (see screenshots). Seemed to be passing a lot of props for no reason, unless there are other SVGs used for that image.
## Why was this MR needed?
~regression
## Screenshots (if relevant)
![Screen_Shot_2017-05-31_at_2.51.49_pm_copy](/uploads/daee2875137b404821344bfa000ecccc/Screen_Shot_2017-05-31_at_2.51.49_pm_copy.png)
Default image placeholder behaviour
Old - broken image was squircle:
![Screen_Shot_2017-05-31_at_5.29.15_pm_copy](/uploads/4ede2f08d44eecd59bf5ed40a1707729/Screen_Shot_2017-05-31_at_5.29.15_pm_copy.png)
New, broken image is placeholder:
![Screen_Shot_2017-05-31_at_5.27.37_pm_copy](/uploads/d16e1a0e7ffc2ff53b8b29b2581a0b06/Screen_Shot_2017-05-31_at_5.27.37_pm_copy.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
- [ ] All builds are passing
- [x] 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)
- [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 #24919.2username-removed-502136username-removed-502136https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2002Fixed header being over issue boards in focus mode2017-09-05T14:34:37ZPhil Hughesme@iamphill.comFixed header being over issue boards in focus mode## What does this MR do?
Fixes the `z-index` of the issue boards app when in focus mode. Previously the `z-index` was below the header which meant you couldn't toggle out of focus mode.
## Screenshots (if relevant)
![Screen_Shot_2017-...## What does this MR do?
Fixes the `z-index` of the issue boards app when in focus mode. Previously the `z-index` was below the header which meant you couldn't toggle out of focus mode.
## Screenshots (if relevant)
![Screen_Shot_2017-05-30_at_14.36.10](/uploads/0aa9e77b534029e63f0394401a653db7/Screen_Shot_2017-05-30_at_14.36.10.png)
## What are the relevant issue numbers?
Closes #24739.2Annabel GrayAnnabel Grayhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2000Geo: Backport Exclusive Lease to 9.22020-07-09T15:39:24ZGabriel MazettoGeo: Backport Exclusive Lease to 9.2## What does this MR do?
Backports the ExclusiveLease changes from !1789
## Are there points in the code the reviewer needs to double check?
I've made the target branch `9-2-stable-ee` as this is a backport.
## Why was this MR n...## What does this MR do?
Backports the ExclusiveLease changes from !1789
## Are there points in the code the reviewer needs to double check?
I've made the target branch `9-2-stable-ee` as this is a backport.
## Why was this MR needed?
While we fixed this and refactored our SystemHook in !1789, because of the SystemHook refactor it did not land in time for 9.2.
There are customers experiencing the issue right now, so I'm backporting the essential part of the first MR.
See #2512 for more information
## 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 #25129.2Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1996Fix Error 500 when viewing a merge request with a deleted source project2020-07-09T15:39:23ZStan HuFix Error 500 when viewing a merge request with a deleted source projectIf the merge request can be rebased based on the history of the commits, users attempting to view the merge request would hit an Error 500. This occurred because `user_can_push_to_source_branch?` would be called on a non-existent project...If the merge request can be rebased based on the history of the commits, users attempting to view the merge request would hit an Error 500. This occurred because `user_can_push_to_source_branch?` would be called on a non-existent project.
Closes gitlab-org/gitlab-ce#330119.2Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1992Fix bug where files over 2 GB would not be saved in Geo tracking DB2020-07-09T15:39:22ZStan HuFix bug where files over 2 GB would not be saved in Geo tracking DBIf an LFS file were over 2 GB, Sidekiq would fail with a message such as:
```
2917923200 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4
```
Increase the value in the database from a 4-by...If an LFS file were over 2 GB, Sidekiq would fail with a message such as:
```
2917923200 is out of range for ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Integer with limit 4
```
Increase the value in the database from a 4-byte integer to a 8-byte integer.9.2Robert SpeicherRobert Speicher