CE upstream - 2018-05-31 21:32 UTC
Files to resolve:
-
@ifarkas Please resolve (UU) app/controllers/profiles_controller.rb
-
@ifarkas Please resolve (UU) app/controllers/projects/issues_controller.rb
-
@ifarkas Please resolve (UU) app/views/projects/issues/_nav_btns.html.haml
-
@ClemMakesApps Please resolve (UU) app/views/shared/issuable/form/_merge_params.html.haml
-
@ifarkas Please resolve (UU) config/routes/project.rb
-
@ifarkas Please resolve (UU) db/schema.rb
-
@pslaughter Please resolve (UU) locale/gitlab.pot
-
@ifarkas Please resolve (UU) spec/controllers/application_controller_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-05-31
branch.
Thanks in advance!
@ifarkas 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 Imre Farkas