CE upstream - 2018-08-17 09:22 UTC
Files to resolve:
-
Daniel Barker Please resolve (AA) app/finders/license_template_finder.rb
-
@vsizov Please resolve (UU) app/services/groups/destroy_service.rb
-
Daniel Barker Please resolve (UU) app/views/admin/application_settings/show.html.haml
-
@lbennett Please resolve (UU) doc/administration/index.md
-
@axil Please resolve (UU) doc/user/project/import/index.md
-
@axil Please resolve (UU) doc/user/project/import/manifest.md
-
@leipert Please resolve (UU) locale/gitlab.pot
-
@leipert Please resolve (UU) spec/javascripts/vue_shared/translate_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-08-17
branch.
Thanks in advance!
@leipert 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