You need to sign in or sign up before continuing.
CE upstream - 2018-09-21 12:16 UTC
Files to resolve:
-
Marcel Amirault Please resolve (UU) CHANGELOG.md
-
@dzaporozhets Please resolve (UU) app/views/layouts/nav/sidebar/_profile.html.haml
-
@dzaporozhets Please resolve (UU) locale/gitlab.pot
-
@dzaporozhets Please resolve (UU) spec/controllers/oauth/applications_controller_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-21
branch.
Thanks in advance!
@dzaporozhets 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