CE upstream - 2018-06-26 00:21 UTC
Files to resolve:
-
@zj Please resolve (UU) .gitignore
-
@filipa Please resolve (UU) app/assets/javascripts/boards/components/board_sidebar.js
-
@filipa Please resolve (AA) app/assets/javascripts/boards/components/sidebar/remove_issue.vue
-
@oswaldo Please resolve (UU) app/workers/all_queues.yml
-
@oswaldo Please resolve (UU) config/sidekiq_queues.yml
-
Roger Rüttimann Please resolve (UU) doc/integration/saml.md
-
@lulalala Please resolve (UU) spec/models/merge_request_spec.rb
Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-26
branch.
Thanks in advance!
@oswaldo 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 'ai-pi' Eipert