Skip to content
Snippets Groups Projects

CE upstream - 2018-06-06 15:12 UTC

Merged CE upstream - 2018-06-06 15:12 UTC
ce-to-ee-2018-06-06 into master
Merged 🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-06-06 into master

Files to resolve:

Try to resolve one file per commit, and then push (no force-push!) to the ce-to-ee-2018-06-06 branch.

More detailed instructions

Thanks in advance! :heart:

@lulalala 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 Mark Chao

Merge request reports

Pipeline #23376741 passed

Stage: build
Stage: prepare
Stage: test
Stage: post-test
Stage: post-cleanup

Pipeline passed for 2f448ee7 on ce-to-ee-2018-06-06

Test coverage 77.30% (0.05%) from 2 jobs

Merged by Rémy CoutableRémy Coutable 6 years ago (Jun 7, 2018 8:20am UTC)

Loading

Pipeline #23387246 passed with warnings

Stage: build
Stage: prepare
Stage: test
Stage: post-test
Stage: pages
Stage: post-cleanup
Stage: deploy

Pipeline passed with warnings for e1f53011 on master

Test coverage 77.30% (0.05%) from 2 jobs
4 environments impacted.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply