-
- Downloads
Merge branch 'undo-revert-of-4892' into 'master'
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master'"" ## What does this MR do? Reverts the revert of !4892 which lacked an EE MR at the time. This has been done in gitlab-org/gitlab-ee!564. ## What are the relevant issue numbers? Closes #19872. See merge request !5310
No related branches found
No related tags found
Showing
- CHANGELOG 1 addition, 0 deletionsCHANGELOG
- app/assets/javascripts/protected_branches.js.coffee 4 additions, 4 deletionsapp/assets/javascripts/protected_branches.js.coffee
- app/controllers/projects/protected_branches_controller.rb 1 addition, 1 deletionapp/controllers/projects/protected_branches_controller.rb
- app/helpers/branches_helper.rb 1 addition, 1 deletionapp/helpers/branches_helper.rb
- app/models/merge_request.rb 7 additions, 1 deletionapp/models/merge_request.rb
- app/models/project.rb 4 additions, 0 deletionsapp/models/project.rb
- app/models/repository.rb 8 additions, 6 deletionsapp/models/repository.rb
- app/services/commits/change_service.rb 2 additions, 2 deletionsapp/services/commits/change_service.rb
- app/services/files/base_service.rb 1 addition, 1 deletionapp/services/files/base_service.rb
- app/services/git_push_service.rb 2 additions, 1 deletionapp/services/git_push_service.rb
- app/services/merge_requests/merge_service.rb 3 additions, 1 deletionapp/services/merge_requests/merge_service.rb
- app/services/merge_requests/refresh_service.rb 1 addition, 1 deletionapp/services/merge_requests/refresh_service.rb
- app/views/projects/merge_requests/widget/open/_conflicts.html.haml 1 addition, 1 deletion.../projects/merge_requests/widget/open/_conflicts.html.haml
- app/views/projects/protected_branches/_branches_list.html.haml 2 additions, 0 deletions...iews/projects/protected_branches/_branches_list.html.haml
- app/views/projects/protected_branches/_protected_branch.html.haml 2 additions, 0 deletions...s/projects/protected_branches/_protected_branch.html.haml
- app/views/projects/protected_branches/index.html.haml 8 additions, 0 deletionsapp/views/projects/protected_branches/index.html.haml
- db/migrate/20160519203051_add_developers_can_merge_to_protected_branches.rb 9 additions, 0 deletions...9203051_add_developers_can_merge_to_protected_branches.rb
- db/migrate/20160629025435_add_column_in_progress_merge_commit_sha_to_merge_requests.rb 8 additions, 0 deletions..._column_in_progress_merge_commit_sha_to_merge_requests.rb
- db/schema.rb 5 additions, 4 deletionsdb/schema.rb
- lib/api/helpers.rb 1 addition, 1 deletionlib/api/helpers.rb
Loading
Please register or sign in to comment