You need to sign in or sign up before continuing.
CE upstream - 2018-03-19 21:23 UTC
Files to resolve:
-
@godfat Please resolve (UU) Gemfile
-
@godfat Please resolve (UU) Gemfile.lock
-
George Tsiolis Please resolve (UU) app/assets/javascripts/vue_merge_request_widget/dependencies.js
-
@joshlambert Please resolve (UU) doc/user/project/integrations/prometheus.md
-
@jprovaznik Please resolve (UU) lib/api/search.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-03-19
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 Robert Speicher