CE upstream - 2018-05-30 15:02 UTC
Files to resolve:
-
@stanhu Please resolve (UU) Gemfile.lock
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) app/models/repository.rb
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) app/views/projects/merge_requests/show.html.haml
-
@annabeldunstone Please resolve (UU) app/views/shared/_import_form.html.haml
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) doc/api/merge_requests.md
-
@tmaczukin Please resolve (UU) doc/ci/variables/README.md
-
@tmaczukin Please resolve (AA) doc/ci/variables/where_variables_can_be_used.md
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) doc/user/project/merge_requests/index.md
-
Vitaliy @blackst0ne Klachkov Please resolve (AA) doc/user/project/merge_requests/squash_and_merge.md
-
@davinwalker Please resolve (UU) lib/api/settings.rb
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) lib/api/v3/merge_requests.rb
-
Vitaliy @blackst0ne Klachkov Please resolve (UU) spec/fixtures/api/schemas/entities/merge_request_widget.json
-
@blackst0ne Please resolve (UU) spec/fixtures/api/schemas/public_api/v3/merge_requests.json
-
@blackst0ne Please resolve (UU) spec/fixtures/api/schemas/public_api/v4/merge_requests.json
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-30
branch.
Thanks in advance!
@tmaczukin 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 Stan Hu