GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2020-09-08T17:43:38Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2056EE version: Clean up the Project model to reduce conflicts2020-09-08T17:43:38Zyorickpeterse-stagingEE version: Clean up the Project model to reduce conflictsThis is the EE version of MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11967. It includes the changes of said MR along with moving all EE specific code (except for some `include` / `prepend` calls) to separate concerns. This...This is the EE version of MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11967. It includes the changes of said MR along with moving all EE specific code (except for some `include` / `prepend` calls) to separate concerns. This should ensure the model is almost identical for both CE and EE, reducing the number of merge conflicts.9.3yorickpeterse-stagingyorickpeterse-staginghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2831Extract methods to EE::Projects::CreateService2020-07-09T16:53:37Zusername-removed-423915Extract methods to EE::Projects::CreateService## What does this MR do?
* Extract EE::Projects::CreateService#after_create_actions
* Extract EE::Projects::CreateService#set_repository_size_limit_as_bytes
## Why was this MR needed?
To help reduce conflicts from CE to EE
#...## What does this MR do?
* Extract EE::Projects::CreateService#after_create_actions
* Extract EE::Projects::CreateService#set_repository_size_limit_as_bytes
## Why was this MR needed?
To help reduce conflicts from CE to EE
## What are the relevant issue numbers?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3722210.0username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2023[EE] Enable the Style/PreferredHashMethods cop2020-07-09T16:52:05Zusername-removed-128633[EE] Enable the Style/PreferredHashMethods copEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11883.
## What does this MR do?
This enables the `Style/PreferredHashMethods` cop (https://github.com/bbatsov/rubocop/blob/022e7322b731b06bd31ce5ef1bac378b27551ed0/lib/ru...EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11883.
## What does this MR do?
This enables the `Style/PreferredHashMethods` cop (https://github.com/bbatsov/rubocop/blob/022e7322b731b06bd31ce5ef1bac378b27551ed0/lib/rubocop/cop/style/preferred_hash_methods.rb).
## Are there points in the code the reviewer needs to double check?
Do we prefer the `verbose` option maybe?9.3Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2874Decrease Perceived and Cyclomatic Complexity2020-07-09T16:06:28Zusername-removed-864731maks.rydkin@gmail.comDecrease Perceived and Cyclomatic Complexity## What does this MR do?
- refactor `app/helpers/license_helper.rb:15:3`
- refactor `app/helpers/tree_helper.rb:111:3`
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
It allows to merge ...## What does this MR do?
- refactor `app/helpers/license_helper.rb:15:3`
- refactor `app/helpers/tree_helper.rb:111:3`
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
It allows to merge these MRs:
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14152
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14160
## 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-ce/issues/31362
- https://gitlab.com/gitlab-org/gitlab-ce/issues/31358
/cc @rymai @markglenfletcher @grzesiek @blackst0ne @rspeicher
Possible labels: ~"Community Contribution" ~backstage ~Edge ~"static analysis"10.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2157Fix admin_audit_logs_spec transient2020-07-09T15:42:06ZLuke "Jared" BennettFix admin_audit_logs_spec transient## What does this MR do?
Find first td within the table before assertion. Seems rspec manages to assert even before the page load.
I added an id to the table element just for sanity.
Failure: https://gitlab.com/gitlab-org/gitlab-ee/bu...## What does this MR do?
Find first td within the table before assertion. Seems rspec manages to assert even before the page load.
I added an id to the table element just for sanity.
Failure: https://gitlab.com/gitlab-org/gitlab-ee/builds/18875159
## 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.3username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2104[EE] Add an optional performance bar to view performance metrics2020-07-09T15:42:05Zusername-removed-128633[EE] Add an optional performance bar to view performance metricsEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11439EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/114399.3Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2664[EE] Enable Timecop safe mode2020-07-09T15:39:37Zusername-removed-128633[EE] Enable Timecop safe mode## What does this MR do?
EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13498## What does this MR do?
EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1349810.0Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1869Make all Serializers receive `current_user` instead `user` [EE]2020-07-09T15:39:34ZOswaldo FerreirMake all Serializers receive `current_user` instead `user` [EE]https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1711 passes `current_user` to the `MergeRequestSerializer`, which passes `current_user` the it's Entity leafs (e.g. `PipelineSerializer`). The problem is that new leafs were added wh...https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1711 passes `current_user` to the `MergeRequestSerializer`, which passes `current_user` the it's Entity leafs (e.g. `PipelineSerializer`). The problem is that new leafs were added while https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1711 wasn't merged, causing conflicts and more overhead about `current_user` or `user` usage.
This MR makes all entities receive `current_user`, avoiding errors and overhead.
CE MR: gitlab-ce!11254
9.2Oswaldo FerreirOswaldo Ferreirhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2081[EE] Let PhantomJS load local images2020-07-09T15:39:29Zusername-removed-128633[EE] Let PhantomJS load local imagesCE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12003
## What does this MR do?
This change fix a memory leak due to a Webkit bug:
https://github.com/ariya/phantomjs/issues/12903
## Screenshots
| PhantomJS mem b...CE MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12003
## What does this MR do?
This change fix a memory leak due to a Webkit bug:
https://github.com/ariya/phantomjs/issues/12903
## Screenshots
| PhantomJS mem before | PhantomJS mem after |
| ---------------------|---------------------|
| ![Screen_Shot_2017-06-08_at_10.16.25](/uploads/a44d8a933c7736ca3cc69f468e704853/Screen_Shot_2017-06-08_at_10.16.25.png) | ![Screen_Shot_2017-06-08_at_10.43.24](/uploads/eb59397b8edfb3ba9cb8d65da1f31d6b/Screen_Shot_2017-06-08_at_10.43.24.png) |
## What are the relevant issue numbers?
Fixes #2162.9.3Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1999[EE] New Migration/UpdateColumnInBatches cop2020-07-09T15:39:22Zusername-removed-128633[EE] New Migration/UpdateColumnInBatches copEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11611
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentatio...EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11611
## 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)9.3Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1646Test both PostgreSQL and MySQL for the win2020-07-09T15:39:19Zusername-removed-423915Test both PostgreSQL and MySQL for the winEE correspondence of gitlab-org/gitlab-ce!10156EE correspondence of gitlab-org/gitlab-ce!101569.2username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/924Speed up Group security access specs2020-07-09T15:37:52ZRobert SpeicherSpeed up Group security access specsThis is the Group equivalent of gitlab-org/gitlab-ce@13ad9a745a392e0bf0cedd0e1f318c1acee9b969
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7813This is the Group equivalent of gitlab-org/gitlab-ce@13ad9a745a392e0bf0cedd0e1f318c1acee9b969
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/78138.15username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1056[EE] Dont persist application settings in test env2020-07-09T15:37:52Zusername-removed-128633[EE] Dont persist application settings in test envEE merge request for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8573EE merge request for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/85738.17Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/844Refactor template selector in issuable form2020-07-09T15:37:51Zusername-removed-128633Refactor template selector in issuable formEE brother of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7249EE brother of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/72498.14Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1525Fix push rules on Git 2.112018-12-13T23:01:14Zusername-removed-128633Fix push rules on Git 2.11## What does this MR do?
The problem was described in https://gitlab.com/gitlab-org/gitlab-ee/issues/1736#note_24262662.
An additional thing that I fixed is that once we found the new commits (via `Gitlab::Popen.popen` in `Repository#n...## What does this MR do?
The problem was described in https://gitlab.com/gitlab-org/gitlab-ee/issues/1736#note_24262662.
An additional thing that I fixed is that once we found the new commits (via `Gitlab::Popen.popen` in `Repository#new_commits`), we try to instantiate commit objects for the returned SHAs. The issue was that those commits are still in the quarantine directories (`GIT_OBJECT_DIRECTORY`, and `GIT_ALTERNATE_OBJECT_DIRECTORIES`) at this point: we needed a way to tell the Rugged repo to look for these SHAs in these directories as well.
After some digging through libgit2 and Rugged, I found out that `Rugged::Repository#new` actually [accepts an `alternate` keyword param](https://github.com/libgit2/rugged/blob/b318a8a14e31477ca08f8c1c61d30d4c9c41a7c5/ext/rugged/rugged_repo.c#L323-L324) just for that!
The final solution is thus to set environment variables in `/api/v3/internal/allowed` from `GIT_OBJECT_DIRECTORY`, and `GIT_ALTERNATE_OBJECT_DIRECTORIES` passed from `gitlab-shell` and use those variable when instantiating the Rugged repo in `Rugged::Repository#new`.
## Are there points in the code the reviewer needs to double check?
I've removed the passing of `env` to `Gitlab::GitAccess#new` since these are already available from the subprocess spawned by `Gitlab::Popen.popen`.
## Why was this MR needed?
To fix push-rules and other commit checks that happens in pre-receive hooks.
## 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)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
- [ ] Be sure to have a single commit for the changes to `app/models/repository.rb` since these are the only one EE-specific
## What are the relevant issue numbers?
Closes #17369.1Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/916Refactor issuable description and metadata form sections2018-12-13T22:50:12Zusername-removed-128633Refactor issuable description and metadata form sectionsContinuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864.
Brother of gitlab-org/gitlab-ce!7758.
Todo:
- [x] Weight selection seems to be broken when creating an issueContinuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864.
Brother of gitlab-org/gitlab-ce!7758.
Todo:
- [x] Weight selection seems to be broken when creating an issue8.15Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/930[EE] Refactor branch chooser in issuable form2018-12-13T22:42:39Zusername-removed-128633[EE] Refactor branch chooser in issuable formContinuation of gitlab-org/gitlab-ce#23864.
Brother of gitlab-org/gitlab-ce!7852.Continuation of gitlab-org/gitlab-ce#23864.
Brother of gitlab-org/gitlab-ce!7852.8.15Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3084Port to EE "Bump google-api-client Gem from 0.8.6 to 0.13.6"2017-10-07T16:33:31ZShinya MaedaPort to EE "Bump google-api-client Gem from 0.8.6 to 0.13.6"## What does this MR do?
Port to EE "Bump google-api-client Gem from 0.8.6 to 0.13.6"
## What are the relevant issue numbers?
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14495
- https://gitlab.com/gitlab-org/gitlab-ce/iss...## What does this MR do?
Port to EE "Bump google-api-client Gem from 0.8.6 to 0.13.6"
## What are the relevant issue numbers?
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14495
- https://gitlab.com/gitlab-org/gitlab-ce/issues/3595410.1Shinya MaedaShinya Maedahttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3065[EE] Fix flaky examples tracking2017-10-06T16:15:57Zusername-removed-128633[EE] Fix flaky examples trackingEE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14681.EE MR for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14681.10.1Grzegorz BizonGrzegorz Bizonhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3079Replace the 'project/merge_requests.feature' spinach test with an rspec analog2017-10-06T16:12:38Zusername-removed-86853blackst0ne.ru@gmail.comReplace the 'project/merge_requests.feature' spinach test with an rspec analog## What does this MR do?
Replaces the EE related spinach specs as part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14621
## Why was this MR needed?
This is a part of the [spinach removal campaign](https://gitlab.com/git...## What does this MR do?
Replaces the EE related spinach specs as part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14621
## Why was this MR needed?
This is a part of the [spinach removal campaign](https://gitlab.com/gitlab-org/gitlab-ce/issues/23036).
## 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/merge_requests/1462110.1username-removed-128633username-removed-128633