GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2017-09-05T14:34:37Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1605CE upstream - Friday2017-09-05T14:34:37Zusername-removed-128633CE upstream - FridayA lot of conflicts today (aka "the feature-freeze effect"):
```
UU app/assets/javascripts/dispatcher.js
UU app/assets/javascripts/environments/folder/environments_folder_view.js
UU app/assets/javascripts/filtered_search/filtered_search_...A lot of conflicts today (aka "the feature-freeze effect"):
```
UU app/assets/javascripts/dispatcher.js
UU app/assets/javascripts/environments/folder/environments_folder_view.js
UU app/assets/javascripts/filtered_search/filtered_search_manager.js
UU app/assets/stylesheets/pages/projects.scss
UU app/controllers/projects/protected_branches_controller.rb
AA app/controllers/projects/protected_refs_controller.rb
AA app/controllers/projects/protected_tags_controller.rb
UU app/controllers/projects/settings/repository_controller.rb
UU app/helpers/branches_helper.rb
UU app/models/concerns/protected_branch_access.rb
UU app/models/group.rb
UU app/models/members/group_member.rb
UU app/models/project.rb
UU app/models/project_services/chat_message/merge_message.rb
UU app/models/protected_branch.rb
UU app/models/user.rb
UU app/services/projects/destroy_service.rb
UU app/views/admin/users/index.html.haml
UU app/views/projects/blob/_header.html.haml
UU app/views/projects/merge_requests/widget/open/_accept.html.haml
UU app/views/shared/_clone_panel.html.haml
UU app/views/shared/issuable/_search_bar.html.haml
UU config/routes/project.rb
UU db/schema.rb
UU doc/README.md
UU doc/api/issues.md
UU lib/gitlab/checks/change_access.rb
UU lib/gitlab/email/handler.rb
UU spec/features/projects/blobs/edit_spec.rb
AA spec/features/protected_tags/access_control_ce_spec.rb
UU spec/lib/gitlab/import_export/all_models.yml
UU spec/lib/gitlab/import_export/safe_model_attributes.yml
UU spec/models/project_services/chat_message/merge_message_spec.rb
UU spec/models/project_services/chat_message/pipeline_message_spec.rb
UU spec/models/project_spec.rb
UU spec/services/projects/destroy_service_spec.rb
UU yarn.lock
```
/cc @felipe_artur @godfat @selfup @timothyandrew please review since you're the RM/RM trainees for %"9.1"9.1https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1863Ee retried in database mysql2017-09-05T14:34:37ZKamil TrzcińśkiEe retried in database mysql## What does this MR do?
Follow up on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11115
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does th...## What does this MR do?
Follow up on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11115
## 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.2username-removed-642931git@selfup.meusername-removed-642931git@selfup.mehttps://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/21199.3.0-ee-rc2 CE to EE merge2017-09-05T14:34:37Zkushalpandya9.3.0-ee-rc2 CE to EE mergeThis MR intends to merge `9-3-stable` into `9-3-stable-ee` for RC2, these are the merge conflicts that occurred while performing merge locally
- [x] @annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-u...This MR intends to merge `9-3-stable` into `9-3-stable-ee` for RC2, these are the merge conflicts that occurred while performing merge locally
- [x] @annabeldunstone please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/assets/javascripts/environments/components/environments_table.vue
- [x] @lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/assets/javascripts/issue_show/components/edited.vue
- [x] @nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/concerns/membership_actions.rb
- [x] @DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/deploy_keys_controller.rb
- [x] @tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/imports_controller.rb
- [x] @lbennett please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/issues_controller.rb
- [x] @jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/projects/protected_refs_controller.rb
- [x] @nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/controllers/sessions_controller.rb
- [ ] @reprazent please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/helpers/button_helper.rb
- [ ] @rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/helpers/dropdowns_helper.rb
- [x] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/ci/pipeline.rb
- [x] @jamedjo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/concerns/protected_ref.rb
- [x] @yorickpeterse please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/project.rb
- [x] @jarka please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/models/project_services/deployment_service.rb
- [x] @smcgivern please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/policies/group_policy.rb
- [ ] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/serializers/pipeline_details_entity.rb
- [ ] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/serializers/pipeline_serializer.rb
- [x] @iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/boards/create_service.rb
- [x] @zj please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/ci/create_pipeline_service.rb
- [ ] @rymai please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/issuable_base_service.rb
- [x] @nick.thomas please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/members/create_service.rb
- [x] @vsizov please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/services/slash_commands/interpret_service.rb
- [x] @tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/app/workers/repository_import_worker.rb
- [x] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/config/routes/user.rb
- [x] @DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/db/schema.rb
- [x] @oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/features/support/env.rb
- [x] @godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/api/groups.rb
- [x] @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/gitlab/checks/change_access.rb
- [x] @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/gitlab/git_access.rb
- [ ] @brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/lib/tasks/gitlab/check.rake
- [ ] @oswaldo please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/controllers/projects/merge_requests_controller_spec.rb
- [ ] @brodock please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/db/production/settings.rb
- [x] @tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/factories/projects.rb
- [x] @timzallmann please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/admin/admin_groups_spec.rb
- [x] @iamphill please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/boards/sidebar_spec.rb
- [x] @ClemMakesApps please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/issues/form_spec.rb
- [x] @mikegreiling please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/features/protected_branches_spec.rb
- [x] @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/git_access_spec.rb
- [x] @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/git_access_wiki_spec.rb
- [x] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/lib/gitlab/import_export/all_models.yml
- [x] @godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/forked_project_link_spec.rb
- [x] @tiagonbotelho please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/project_spec.rb
- [x] @DouweM please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/models/user_spec.rb
- [x] @godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/requests/api/users_spec.rb
- [x] @mkozono please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/requests/git_http_spec.rb
- [ ] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/serializers/pipeline_details_entity_spec.rb
- [ ] @ayufan please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/serializers/pipeline_serializer_spec.rb
- [x] @godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/create_deployment_service_spec.rb
- [x] @godfat please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/projects/fork_service_spec.rb
- [x] @dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/create_service_spec.rb
- [x] @dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/destroy_service_spec.rb
- [x] @dbalexandre please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/services/wiki_pages/update_service_spec.rb
- [x] @grzesiek please resolve https://gitlab.com/gitlab-org/gitlab-ee/blob/ce-to-ee-update-9-3-ee-rc2/spec/spec_helper.rb
Once conflicts are resolved, push your changes to this branch, again, **don't force push!**.9.3username-removed-408677username-removed-408677https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2823Make download dropdown style on branches / tags pages consistent2017-09-05T10:08:47ZWinnie HellmannMake download dropdown style on branches / tags pages consistentThis is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13417.
## What does this MR do?
Change download dropdowns on branches and tags page to new style.
## Screenshots
| Page | Before | After |
|------|--------|--...This is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13417.
## What does this MR do?
Change download dropdowns on branches and tags page to new style.
## Screenshots
| Page | Before | After |
|------|--------|-------|
| [Branches](https://gitlab.com/gitlab-org/gitlab-ce/branches/) | ![Screen_Shot_2017-08-09_at_12.25.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9a4d098e7d7f65074894872a106087c8/Screen_Shot_2017-08-09_at_12.25.20.png) | ![Screen_Shot_2017-08-09_at_12.23.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/adf5fdd532785da9a94f3d9c16ce1a0e/Screen_Shot_2017-08-09_at_12.23.19.png) |
| [Tags](https://gitlab.com/gitlab-org/gitlab-ce/tags/) | ![Screen_Shot_2017-08-09_at_12.26.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/084ed8888efcc651a23cd754db1b355b/Screen_Shot_2017-08-09_at_12.26.08.png) | ![Screen_Shot_2017-08-09_at_12.23.42](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9fcf1b1db17cd8ccd8cd07c03d522da6/Screen_Shot_2017-08-09_at_12.23.42.png) |
## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/28921, https://gitlab.com/gitlab-org/gitlab-ce/issues/3542410.0Phil Hughesme@iamphill.comPhil Hughesme@iamphill.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2329Update PostgreSQL HA alpha document for repmgr automation2017-09-04T10:56:38ZIan BaumUpdate PostgreSQL HA alpha document for repmgr automationSee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Update PG HA alpha documentation to reflect the current state of documentation
Closes gitlab-org/omnibus...See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Update PG HA alpha documentation to reflect the current state of documentation
Closes gitlab-org/omnibus-gitlab#25729.5Marin JankovskiMarin Jankovskihttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2798Fix article date2017-08-31T19:47:51Zusername-removed-236961Fix article dateSee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Ports to EESee the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html
## What does this MR do?
Ports to EE10.0Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2528EE-Port: Alternative fix for 422 when using standard login with ldap enabled2017-08-24T16:00:53ZBob Van Landuyt :neckbeard:EE-Port: Alternative fix for 422 when using standard login with ldap enabledThis is an EE-Port of: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13103This is an EE-Port of: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/131039.5Bob Van Landuyt :neckbeard:Bob Van Landuyt :neckbeard:https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/1334Remove git hooks documentation2017-08-24T09:32:25Zusername-removed-2900Remove git hooks documentationRemove the git hooks docs.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/755Remove the git hooks docs.
Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7559.0username-removed-2900username-removed-2900https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2742New Crowdin translations2017-08-23T13:15:13ZGitLab Crowdin BotNew Crowdin translationsEnjoy!Enjoy!https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2695EE version of Client Implementation: RefService::RefExists2017-08-22T15:31:30ZAndrew Newdigateandrew@gitlab.comEE version of Client Implementation: RefService::RefExists## What does this MR do?
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13528
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## Screenshots (if relevant)
## Does ...## What does this MR do?
EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13528
## 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?Andrew Newdigateandrew@gitlab.comAndrew Newdigateandrew@gitlab.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2723Fix testing of Jenkins integration2017-08-22T07:51:33ZRubén DávilaFix testing of Jenkins integration## What does this MR do?
Fix the testing of Jenkins integration that was broken due to we weren't creating the Service/ServiceHook records.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?...## What does this MR do?
Fix the testing of Jenkins integration that was broken due to we weren't creating the Service/ServiceHook records.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
Users were unable to test their Jenkins integration
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added, if necessary
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ee/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #31949.5Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2718WIP: [skip ci] add feature highlight2017-08-21T19:43:12Zusername-removed-408677WIP: [skip ci] add feature highlight## 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 https://gitlab.com/gitlab-org/gitlab-ce/issues/36760https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2216WIP: Resolve "Approvers have no space between name and username"2017-08-21T13:25:41ZTim ZallmannWIP: Resolve "Approvers have no space between name and username"## 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 #2713https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2539WIP: Resolve "Promote features to unlicensed users"2017-08-21T13:25:26ZTim ZallmannWIP: Resolve "Promote features to unlicensed users"## 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 #2624https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2703Fetch correct key in the settings hash2017-08-17T12:08:01ZZeger-Jan van de Wegzegerjan@gitlab.comFetch correct key in the settings hash## 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?
Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/3172
/cc @ayufan @ahanselka 9.4Zeger-Jan van de Wegzegerjan@gitlab.comZeger-Jan van de Wegzegerjan@gitlab.comhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2511State counter cache stable2017-08-15T15:02:52Zusername-removed-443319State counter cache stableJames EJJames EJhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2633Disable Ajax request for GPG status on repository page2017-08-14T20:02:20ZWinnie HellmannDisable Ajax request for GPG status on repository pageThis is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13337 (which admittedly has a much nicer ID).
## What does this MR do?
Load GPG status of last commit synchronously on repository page.
## Screenshots
...This is the same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13337 (which admittedly has a much nicer ID).
## What does this MR do?
Load GPG status of last commit synchronously on repository page.
## Screenshots
| Before | After |
| --- | --- |
| ![Screen_Shot_2017-08-07_at_14.17.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6b22011c477c4f3eb16f36bafcae3926/Screen_Shot_2017-08-07_at_14.17.58.png) | ![Screen_Shot_2017-08-07_at_14.16.41](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ddcf7190102e6242a79494b880982c22/Screen_Shot_2017-08-07_at_14.16.41.png) |
| ![Screen_Shot_2017-08-07_at_19.19.34](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12fb3969e416a23c99c763c42e54bb7d/Screen_Shot_2017-08-07_at_19.19.34.png) | ![Screen_Shot_2017-08-07_at_19.17.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/94ee4966926c59c68b9158f86c7fc3fa/Screen_Shot_2017-08-07_at_19.17.39.png) |
## What are the relevant issue numbers?
fixes #35699, #360469.5Winnie HellmannWinnie Hellmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2578WIP: Resolve "Promote merge request approval"2017-08-14T10:30:48ZTim ZallmannWIP: Resolve "Promote merge request approval"## 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 #2888Tim ZallmannTim Zallmannhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/2605Port of latest Gitaly migrations to EE2017-08-11T04:43:06Zusername-removed-506061Port of latest Gitaly migrations to EE9.5username-removed-506061username-removed-506061