CE upstream - 2018-09-08 09:21 UTC
Files to resolve:
-
@wortschi Please resolve (UU) app/assets/javascripts/projects/project_new.js
-
@eread Please resolve (UU) doc/ci/variables/README.md
-
@eread Please resolve (UU) doc/ci/variables/where_variables_can_be_used.md
-
@wortschi Please resolve (UU) locale/gitlab.pot
-
@rdavila Please resolve (UU) spec/controllers/admin/application_settings_controller_spec.rb
-
@wortschi Please resolve (UU) spec/javascripts/lib/utils/text_utility_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-09-08
branch.
Thanks in advance!
@wortschi 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 Lukas Eipert