CE upstream - 2018-10-06 00:21 UTC
Files to resolve:
-
@nick.thomas Please resolve (UU) app/assets/javascripts/api.js
-
Tuomo Ala-Vannesluoma Please resolve (UU) app/assets/javascripts/pages/projects/shared/permissions/components/settings_panel.vue
-
@nick.thomas Please resolve (UU) app/finders/license_template_finder.rb
-
@nick.thomas Please resolve (UU) app/finders/template_finder.rb
-
@dosuken123 Please resolve (UU) app/models/commit_status.rb
-
@felipe_artur Please resolve (UU) app/models/issue.rb
-
@digitalmoksha Please resolve (UU) app/models/note.rb
-
@digitalmoksha Please resolve (UU) app/models/system_note_metadata.rb
-
@dosuken123 Please resolve (AA) app/services/ci/process_build_service.rb
-
@dosuken123 Please resolve (UU) db/schema.rb
-
@nick.thomas Please resolve (UU) doc/api/README.md
-
@nolith Please resolve (UU) spec/features/projects/jobs_spec.rb
-
@felipe_artur Please resolve (UU) spec/models/issue_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-10-06
branch.
Thanks in advance!
@nick.thomas 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