CE upstream - 2018-10-04 10:35 UTC
Files to resolve:
-
@filipa Please resolve (AA) app/assets/javascripts/jobs/components/job_app.vue
-
@filipa Please resolve (UU) app/assets/javascripts/jobs/job_details_bundle.js
-
@filipa Please resolve (AA) app/assets/javascripts/jobs/store/getters.js
-
@wortschi Please resolve (UU) app/views/projects/_import_project_pane.html.haml
-
@wortschi Please resolve (UU) app/views/projects/_new_project_fields.html.haml
-
@filipa Please resolve (UU) app/views/projects/jobs/show.html.haml
-
@wortschi Please resolve (UU) app/views/projects/project_templates/_built_in_templates.html.haml
-
@wortschi Please resolve (UU) app/views/shared/_visibility_radios.html.haml
-
Semyon Pupkov Please resolve (UU) config/routes/project.rb
-
@wortschi Please resolve (UU) config/routes/user.rb
-
@tiagonbotelho Please resolve (UU) lib/api/commits.rb
-
@dennis Please resolve (UU) locale/gitlab.pot
-
@filipa Please resolve (AA) spec/javascripts/jobs/components/job_app_spec.js
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-04
branch.
Thanks in advance!
@filipa 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 Martin Wortschack