CE upstream - 2018-03-07 17:11 UTC
Files to resolve:
-
@stanhu Please resolve (UU) app/models/repository.rb
-
@mikegreiling Please resolve (UU) app/views/projects/settings/repository/show.html.haml
-
@jprovaznik Please resolve (AA) doc/api/discussions.md
-
@jprovaznik Please resolve (AA) lib/api/discussions.rb
-
@jprovaznik Please resolve (AA) lib/api/helpers/notes_helpers.rb
-
@stanhu Please resolve (UU) lib/gitlab/utils.rb
-
@jprovaznik Please resolve (AA) spec/requests/api/discussions_spec.rb
-
@jprovaznik Please resolve (UU) spec/requests/api/notes_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-07
branch.
Thanks in advance!
@jprovaznik 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 Robert Speicher