CE upstream - 2018-09-17 12:35 UTC
Files to resolve:
-
@godfat Please resolve (UU) app/models/concerns/protected_branch_access.rb
-
@godfat Please resolve (UU) app/models/concerns/protected_tag_access.rb
-
Kukovskii Vladimir Please resolve (AA) changelogs/unreleased/44596-double-title-merge-request-message.yml
-
@axil Please resolve (AA) doc/user/admin_area/img/admin_area_settings_button.png
-
@axil Please resolve (UU) doc/user/admin_area/settings/continuous_integration.md
-
@godfat Please resolve (UU) spec/support/helpers/stub_configuration.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-17
branch.
Thanks in advance!
@godfat After you resolved the conflicts, please assign to the next person. If you're the last one to resolve the conflicts, please push this to be merged.
Note: This merge request was created by an automated script. Please report any issue at https://gitlab.com/gitlab-org/release-tools/issues!
Edited by Achilleas Pipinellis