GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-08-28T10:40:26Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2768EE::ProtectedRef inherits has_many and accepts_nested_attributes_for2017-08-28T10:40:26ZJames EJEE::ProtectedRef inherits has_many and accepts_nested_attributes_for## What
Prevents EE from overwriting `has_many :"#{type}_access_levels"` and `accepts_nested_attributes_for :"#{type}_access_levels"`.
## Are there points in the code the reviewer needs to double check?
~~One side effect is that...## What
Prevents EE from overwriting `has_many :"#{type}_access_levels"` and `accepts_nested_attributes_for :"#{type}_access_levels"`.
## Are there points in the code the reviewer needs to double check?
~~One side effect is that this reintroduces a `dependent: destroy`, until that is removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13835.~~
## Why
Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13693#note_38537325
## Relates to
- https://gitlab.com/gitlab-org/gitlab-ce/issues/36013
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13693James EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2801Port "Extend API: Pipeline Schedule Variable" to EE2020-07-09T16:48:09ZShinya MaedaPort "Extend API: Pipeline Schedule Variable" to EE## What does this MR do?
Port "Extend API: Pipeline Schedule Variable" to EE, due to ee-compat failure.
I just fixed
```diff
> g di
diff --cc lib/api/entities.rb
index e3771acdd7,9cac2ff248..0000000000
--- a/lib/api/entitie...## What does this MR do?
Port "Extend API: Pipeline Schedule Variable" to EE, due to ee-compat failure.
I just fixed
```diff
> g di
diff --cc lib/api/entities.rb
index e3771acdd7,9cac2ff248..0000000000
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@@ -875,14 -818,7 +875,14 @@@ module AP
class Variable < Grape::Entity
expose :key, :value
- expose :protected?, as: :protected
+ expose :protected?, as: :protected, if: -> (entity, _) { entity.respond_to?(:protected?) }
+
+ # EE
+ expose :environment_scope, if: ->(variable, options) {
+ if variable.respond_to?(:environment_scope)
+ variable.project.feature_available?(:variable_environment_scope)
+ end
+ }
end
class Pipeline < PipelineBasic
```
## What are the relevant issue numbers?
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13653
- https://gitlab.com/gitlab-org/gitlab-ce/issues/3451810.0Shinya MaedaShinya Maedahttps://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/2859simplify git-annex to LFS migration guide2020-07-09T16:06:26Zusername-removed-71118simplify git-annex to LFS migration guide## What does this MR do?
This simplifies the git-annex to git LFS migration guide by removing references to direct/indirect mode.
I do not believe it is necessary to switch between indirect and direct mode: uninit does all of that for ...## What does this MR do?
This simplifies the git-annex to git LFS migration guide by removing references to direct/indirect mode.
I do not believe it is necessary to switch between indirect and direct mode: uninit does all of that for us. We also show how to do a simple backup.https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2869fix creating labels from Group Boards sidebar2020-07-09T16:06:26ZSimon Knoxfix creating labels from Group Boards sidebar## What does this MR do?
Fix namespace_path for Group Boards sidebar
## Are there points in the code the reviewer needs to double check?
## Does this MR meet the acceptance criteria?
- Tests
- [ ] Added for this feature/bug
- [ ]...## What does this MR do?
Fix namespace_path for Group Boards sidebar
## Are there points in the code the reviewer needs to double check?
## Does this MR meet the acceptance criteria?
- 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 #336910.0Simon KnoxSimon Knoxhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2872Update test-and-deploy-python-application-to-heroku.md2020-07-09T16:06:25Zusername-removed-1580234Update test-and-deploy-python-application-to-heroku.mdSee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Corrects a small spelling issue.See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Corrects a small spelling issue.https://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/2894The setting gitlabURL should actually be in camel case gitlabUrl.2017-09-15T12:21:56Zusername-removed-277773The setting gitlabURL should actually be in camel case gitlabUrl.## 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?
- [x] [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?
- [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
- [ ] 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?https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2902Remove small artifact from merging2017-09-13T09:07:01Zusername-removed-828119Remove small artifact from merging## What does this MR do?
Removes a small artifact from previous merge
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Fixes documentation## What does this MR do?
Removes a small artifact from previous merge
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Fixes documentationhttps://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/2915Transfer artifacts to object storage after storing2020-09-08T17:52:36ZZeger-Jan van de Wegzegerjan@gitlab.comTransfer artifacts to object storage after storing## What does this MR do?
After a build is finished, it schedules the artifact for uploading to an object storage.
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.h...## What does this MR do?
After a build is finished, it schedules the artifact for uploading to an object storage.
## 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
- [-] 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?
Fixes gitlab-org/gitlab-ee#334610.1Kamil TrzcińśkiKamil Trzcińśkihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2941document that LFS is enabled by default2017-09-17T11:08:49Zusername-removed-5332document that LFS is enabled by default## What does this MR do?
document that LFS is enabled by default
Replaces https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2888## What does this MR do?
document that LFS is enabled by default
Replaces https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2888https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2970Update LICENSE to clean up formatting2017-09-21T21:35:20ZJamie HurewitzUpdate LICENSE to clean up formattingClean up formatting in text.Clean up formatting in text.Jacob SchatzJacob Schatzhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2978Improved Geo development documentation with 10.0 and 10.1 changes.2017-10-06T21:27:25ZGabriel MazettoImproved Geo development documentation with 10.0 and 10.1 changes.## What does this MR do?
Improve documentation regarding the Geo Log Cursor, Tracking Database and some extra gotchas in the `Gitlab::Geo` API.
## What are the relevant issue numbers?
Related to https://gitlab.com/gitlab-org/git...## What does this MR do?
Improve documentation regarding the Geo Log Cursor, Tracking Database and some extra gotchas in the `Gitlab::Geo` API.
## What are the relevant issue numbers?
Related to https://gitlab.com/gitlab-org/gitlab-ee/issues/338210.1Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2982Add step to initialize cluster with primary database node2020-07-09T16:20:05ZChenjerai KatandaAdd step to initialize cluster with primary database node## What does this MR do?
Add step to initialize cluster with primary db node to
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2795## What does this MR do?
Add step to initialize cluster with primary db node to
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2795https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2997Update kubernetes.md - Fixed broken link (GitLab Auto-Deploy).2017-09-22T04:16:21Zusername-removed-1092990Update kubernetes.md - Fixed broken link (GitLab Auto-Deploy).## What does this MR do?
Fixed broken link (GitLab Auto-Deploy).
## 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...## What does this MR do?
Fixed broken link (GitLab Auto-Deploy).
## 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/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://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3008EE: Add cop to make sure we don't use ivar in a module2017-12-19T15:58:52Zusername-removed-423915EE: Add cop to make sure we don't use ivar in a moduleEE part for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12800EE part for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1280010.2username-removed-423915username-removed-423915https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3012WIP: Manage Geo SSH keys automatically2017-10-05T14:29:43ZNick ThomasWIP: Manage Geo SSH keys automatically## 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/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 #125510.2Nick ThomasNick Thomashttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3029WIP: Refactor controller calls into services2020-09-08T17:33:01ZJames LopezWIP: Refactor controller calls into servicesFixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3544
- [ ] [Changelog entry](https://docs.gitlab.com/ee/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://docs.gitlab.com/ee/development/do...Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3544
- [ ] [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?James LopezJames Lopezhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/3042Clarifying restore instructions.2017-10-03T22:39:43Zusername-removed-1215240Clarifying restore instructions.See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Clarifying restore instructions regarding the behavior when a backup directory is not explicitly set and the re...See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Clarifying restore instructions regarding the behavior when a backup directory is not explicitly set and the requirements for the name of a restore file.
## Moving docs to a new location?
See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location
- [x] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [x] Make sure internal links pointing to the document in question are not broken.
- [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [x] If working on CE, submit an MR to EE with the changes as well.