GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-08-10T19:07:34Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2152CE upstream - Friday2017-08-10T19:07:34Zusername-removed-128633CE upstream - FridayFiles to resolve:
- [ ] @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/framework/panels.scss (UU)
- [ ] @madlittlemods Please resolve https://gi...Files to resolve:
- [ ] @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/framework/panels.scss (UU)
- [ ] @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/boards.scss (UU)
- [ ] @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/issues.scss (UU)
- [ ] @annabeldunstone Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/assets/stylesheets/pages/pipelines.scss (UU)
- [ ] Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/application_setting.rb (UU)
- [ ] @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/ci/build.rb (UU)
- [ ] @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/models/project_services/kubernetes_service.rb (UU)
- [ ] @alfredo1 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/serializers/group_entity.rb (UU)
- [ ] @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/services/git_push_service.rb (UU)
- [ ] @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/services/git_tag_push_service.rb (UU)
- [ ] Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/help/index.html.haml (UU)
- [ ] Mike Ricketts Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/layouts/_broadcast.html.haml (UU)
- [ ] @madlittlemods Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/projects/boards/components/_board.html.haml (UU)
- [x] @filipa Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/projects/jobs/_sidebar.html.haml (UU)
- [ ] @lbennett Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/app/views/shared/issuable/form/_merge_params.html.haml (UU)
- [x] @yorickpeterse Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/config/sidekiq_queues.yml (UU)
- [ ] @smcgivern Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/db/schema.rb (UU)
- [x] @axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/api/README.md (UU)
- [x] vanadium23 Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/api/projects.md (UU)
- [x] @axil Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/doc/ci/examples/code_climate.md (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/rubocop/cop/rspec/single_line_hook.rb (AA)
- [ ] @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/controllers/projects/jobs_controller_spec.rb (UU)
- [ ] Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/help_pages_spec.rb (UU)
- [ ] @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/projects/jobs_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/protected_branches_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/features/protected_tags_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/database/migration_helpers_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/git_access_spec.rb (UU)
- [ ] @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/kubernetes_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/lib/gitlab/saml/user_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/models/project_services/kubernetes_service_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/policies/project_snippet_policy_spec.rb (UU)
- [ ] @godfat Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/jobs_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/runner_spec.rb (UU)
- [ ] Robin Bobbitt Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/api/settings_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/requests/ci/api/builds_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/rubocop/cop/rspec/single_line_hook_spec.rb (AA)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/serializers/pipeline_serializer_spec.rb (UU)
- [ ] @rspeicher Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/services/merge_requests/update_service_spec.rb (UU)
- [ ] @nick.thomas Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/support/kubernetes_helpers.rb (UU)
- [ ] @ayufan Please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/d9cdb23a26389c916b70ba2056091086429e44b4/spec/uploaders/artifact_uploader_spec.rb (UU)
Once the conflicts resolved, please push (no force-push!) to the `ce-to-ee-2017-06-16` branch.
Thanks in advance! ❤️
Note: This merge request was created by an experimental script, it's not perfect (yet)!username-removed-128633username-removed-128633https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2162WIP: Do not enable prometheus metrics when metrics folder is missing2017-08-10T18:20:53Zusername-removed-676946WIP: Do not enable prometheus metrics when metrics folder is missing## 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?
gitlab-ce#33823https://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/2150Ensures default user limits when external user is unchecked2017-08-10T18:17:20Zusername-removed-117638Ensures default user limits when external user is unchecked## 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?
Closes #30725username-removed-117638username-removed-117638https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2624WIP: Resolve "Unable to make initial commit and/or add initial file via GitLa...2017-08-08T10:20:06ZXiaogang WenWIP: Resolve "Unable to make initial commit and/or add initial file via GitLab v4 api"## 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](htt...## 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?
Closes #3113https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2424Add filtered search to group issue dashboard (EE)2017-08-05T01:04:18Zusername-removed-408677Add filtered search to group issue dashboard (EE)## What does this MR do?
Adds the filtered search to group issue dashboard (EE Version)
CE version: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13167
## Are there points in the code the reviewer needs to double check?
...## What does this MR do?
Adds the filtered search to group issue dashboard (EE Version)
CE version: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13167
## Are there points in the code the reviewer needs to double check?
Shouldn't be
## Why was this MR needed?
~Deliverable
## Screenshots (if relevant)
| Before | After |
|---|---|
|![Screen_Shot_2017-07-13_at_3.45.01_PM](/uploads/37d58e8853e1803f29081f700e0f0671/Screen_Shot_2017-07-13_at_3.45.01_PM.png) | ![Screen_Shot_2017-07-13_at_3.44.32_PM](/uploads/67a48546c840589b0518fa28f791f919/Screen_Shot_2017-07-13_at_3.44.32_PM.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
- [ ] 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/335759.5Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2598CE upstream: Friday2017-08-04T11:46:14Zusername-removed-423915CE upstream: FridayIt's gonna be fun
both modified: app/assets/javascripts/dispatcher.js
both added: app/assets/javascripts/init_issuable_sidebar.js
both added: app/assets/javascripts/init_legacy_filters.js
both modified: app/assets/java...It's gonna be fun
both modified: app/assets/javascripts/dispatcher.js
both added: app/assets/javascripts/init_issuable_sidebar.js
both added: app/assets/javascripts/init_legacy_filters.js
both modified: app/assets/javascripts/main.js
both modified: app/assets/javascripts/profile/gl_crop.js
both modified: app/assets/javascripts/project.js
both added: app/assets/javascripts/projects/project_new.js
both modified: app/assets/stylesheets/framework/dropdowns.scss
both modified: app/assets/stylesheets/framework/variables.scss
both modified: app/models/project.rb
both modified: app/models/project_wiki.rb
both added: app/services/ci/pipeline_trigger_service.rb
both modified: app/services/git_push_service.rb
both modified: app/services/merge_requests/base_service.rb
both modified: app/views/groups/issues.html.haml
both modified: app/views/layouts/nav/_new_admin_sidebar.html.haml
both modified: app/views/layouts/nav/_new_project_sidebar.html.haml
both modified: app/views/projects/commits/show.html.haml
both modified: app/views/projects/tree/_tree_content.html.haml
both modified: app/views/shared/_clone_panel.html.haml
both modified: db/schema.rb
both modified: doc/README.md
both modified: doc/api/users.md
both modified: doc/articles/index.md
both modified: doc/user/project/milestones/index.md
both modified: lib/banzai/filter/upload_link_filter.rb
both modified: lib/tasks/gitlab/gitaly.rake
both added: scripts/gitaly-test-build
both modified: spec/controllers/projects/imports_controller_spec.rb
both modified: spec/controllers/projects/settings/integrations_controller_spec.rb
both modified: spec/factories/boards.rb
both modified: spec/factories/forked_project_links.rb
both modified: spec/factories/issues.rb
both modified: spec/factories/projects.rb
both modified: spec/factories/protected_branches.rb
both modified: spec/factories/protected_tags.rb
both modified: spec/features/boards/boards_spec.rb
both modified: spec/finders/issues_finder_spec.rb
both modified: spec/helpers/gitlab_routing_helper_spec.rb
both modified: spec/helpers/groups_helper_spec.rb
both modified: spec/lib/banzai/filter/upload_link_filter_spec.rb
both modified: spec/lib/gitlab/import_export/all_models.yml
both modified: spec/models/concerns/issuable_spec.rb
both modified: spec/models/project_spec.rb
both modified: spec/requests/api/boards_spec.rb
both modified: spec/requests/api/groups_spec.rb
both modified: spec/requests/api/v3/groups_spec.rb
both modified: spec/requests/lfs_http_spec.rb
both modified: spec/services/boards/issues/list_service_spec.rb
both added: spec/services/ci/pipeline_trigger_service_spec.rb
deleted by them: spec/services/notification_recipient_service_spec.rb
both modified: spec/services/wiki_pages/create_service_spec.rb
both modified: spec/services/wiki_pages/destroy_service_spec.rb
both modified: spec/services/wiki_pages/update_service_spec.rb
both modified: spec/spec_helper.rb
both modified: spec/tasks/gitlab/gitaly_rake_spec.rb9.5username-removed-423915username-removed-423915https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2550Frontend support SSH public-key authentication for pull mirroring2017-08-04T10:32:29ZkushalpandyaFrontend support SSH public-key authentication for pull mirroring## What does this MR do?
Adds frontend part for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- ~~[ ] [Changelog entry](https://docs.git...## What does this MR do?
Adds frontend part for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2551
## 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?
#98https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2595WIP: Prepare 9.4.4-ee release2017-08-03T22:38:04ZJames EJWIP: Prepare 9.4.4-ee releaseMain release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge...Main release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.4&scope=all&sort=updated_asc&state=merged
### Steps
- Ensure all the MRs in above list are picked into `9-4-stable-ee-patch-4` branch.
- Note the following in each picked MR:
```
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/MERGE_REQUST_ID, will merge into `9-4-stable-ee` ready for `9.4.4-ee`
/unlabel ~"Pick into Stable"
```
- If there are any conflicts while picking MRs, attempt to resolve, otherwise create new MR against `9-4-stable-ee-patch-4` branch and assign it to author of conflicting files.
- Consider merging CE-to-EE stable MR into this as well for new workflow
- Once this MR is green merge it.9.4James EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2594WIP: Prepare 9.4.4-ee release2017-08-03T18:18:07ZJames EJWIP: Prepare 9.4.4-ee releaseMain release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge...Main release issue:
### Summary
This MR prepares `9-4-stable-ee` for %"9.4" (`9.4.4-ee`) by merging `9-4-stable-ee-patch-4` into `9-4-stable-ee`
### MR Filter for ~"Pick into Stable" MRs
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests?label_name%5B%5D=Pick+into+Stable&milestone_title=9.4&scope=all&sort=updated_asc&state=merged
### Steps
- Ensure all the MRs in above list are picked into `9-4-stable-ee-patch-4` branch.
- Note the following in each picked MR:
```
Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/MERGE_REQUST_ID, will merge into `9-4-stable-ee` ready for `9.4.4-ee`
/unlabel ~"Pick into Stable"
```
- If there are any conflicts while picking MRs, attempt to resolve, otherwise create new MR against `9-4-stable-ee-patch-4` branch and assign it to author of conflicting files.
- Consider merging CE-to-EE stable MR into this as well for new workflow
- Once this MR is green merge it.James EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2423WIP: Support SSH public-key authentication for pull mirroring2017-07-31T15:30:46ZNick ThomasWIP: Support SSH public-key authentication for pull mirroring## What does this MR do?
Introduces SSH public-key authentication to pull mirroring.
Tasks:
- [x] Configuration backend (username/password auth)
- [x] Configuration backend (public-key auth)
- [x] Configuration frontend (wiref...## What does this MR do?
Introduces SSH public-key authentication to pull mirroring.
Tasks:
- [x] Configuration backend (username/password auth)
- [x] Configuration backend (public-key auth)
- [x] Configuration frontend (wireframe)
- [ ] Configuration frontend (complete)
- [x] SSH known_hosts file generator (backend)
- [x] SSH host key fingerprint verification (backend)
- [ ] SSH host key fingerprint verification (frontend)
- [x] `gitlab-shell.fetch_remote` updated to support pubkey auth
- [ ] https://gitlab.com/gitlab-org/gitlab-shell/issues/95
- [ ] Comprehensive test coverage. Pull mirroring seems to be mostly untested at the moment
## Are there points in the code the reviewer needs to double check?
The `import_url` and `project_import_data` data is shared with CE, so we need to pay attention to backports when refactoring.
## Why was this MR needed?
Scheduled feature for %9.5
## 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
- [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 #98 https://gitlab.com/gitlab-org/gitlab-ce/issues/213919.5Nick ThomasNick Thomashttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2519Add a note about EFS and GitLab log files2017-07-30T14:50:53ZStan HuAdd a note about EFS and GitLab log fileshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/979Bitbucket Oauth instructions for GitHost2017-07-28T15:55:34ZDe WetBitbucket Oauth instructions for GitHostGitHost.io users do not have access to their configuration files, so when they follow the instructions, they need to know that they can do it in the GitHost admin panel.GitHost.io users do not have access to their configuration files, so when they follow the instructions, they need to know that they can do it in the GitHost admin panel.Drew BlessingDrew Blessinghttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2547Fix RSpec/DescribedClass violation2017-07-27T18:40:33ZRobert SpeicherFix RSpec/DescribedClass violationFixes a current failure in EE `master` such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/25009793Fixes a current failure in EE `master` such as https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/250097939.5Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2544Update index.md: fixed typo (john was misspelled)2017-07-27T17:38:08Zusername-removed-1495591Update index.md: fixed typo (john was misspelled)## 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
- [x] Added for this feature/bug
- [x] 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/2538Implement "Block pipelines on protected branches" for EE2017-07-27T17:18:47Zusername-removed-423915Implement "Block pipelines on protected branches" for EEEE counterpart of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910
It's already resolved in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2527 however it might not be merged soon, so let's split this.EE counterpart of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11910
It's already resolved in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2527 however it might not be merged soon, so let's split this.9.5username-removed-423915username-removed-423915https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2537Resolve "Trial and license purchases inside GitLab EE"2017-07-27T02:46:49ZRubén DávilaResolve "Trial and license purchases inside GitLab EE"## 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?
Closes #2501https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2536Resolve "Trial and license purchases inside GitLab EE"2017-07-27T02:29:00ZRubén DávilaResolve "Trial and license purchases inside GitLab EE"## 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?
Closes #2501kushalpandyakushalpandyahttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2523Update the mirror delay to something that's valid in controller spec2017-07-26T07:16:15ZRobert SpeicherUpdate the mirror delay to something that's valid in controller specExtracted from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2431 to address a failure currently in EE `master` -- https://gitlab.com/gitlab-org/gitlab-ee/issues/3008Extracted from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2431 to address a failure currently in EE `master` -- https://gitlab.com/gitlab-org/gitlab-ee/issues/30089.5Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2495Related Issues docs minor improvements2017-07-26T03:12:18ZOswaldo FerreirRelated Issues docs minor improvements## What does this MR do?
- Minor adjustments on current docs
- Add link to API docs
- Add Related Issues to permissions list## What does this MR do?
- Minor adjustments on current docs
- Add link to API docs
- Add Related Issues to permissions list9.5Achilleas PipinellisAchilleas Pipinellis