Primary navigation

Project

GitLab
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

!6012

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

Review changes
Download
Patches
Plain diff

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

ce-to-ee-2018-06-06 into master

Overview 2
Commits 153
Pipelines 6
Changes 130

Merged 🤖 GitLab Bot 🤖 requested to merge ce-to-ee-2018-06-06 into master 6 years ago

Overview 2
Commits 153
Pipelines 6
Changes 130

Files to resolve:

@lulalala Please resolve (UU) app/views/projects/project_members/index.html.haml
@reprazent Please resolve (UU) config/routes/api.rb
@lulalala Please resolve (UU) doc/api/namespaces.md
@lulalala Please resolve (UU) doc/api/protected_branches.md
@axil Please resolve (UU) doc/ci/variables/README.md
@lulalala Please resolve (UU) doc/system_hooks/system_hooks.md
@lulalala Please resolve (UU) doc/user/project/protected_branches.md
@lulalala Please resolve (UU) lib/api/protected_branches.rb
@lulalala Please resolve (UU) locale/gitlab.pot

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!

@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 6 years ago by Mark Chao

Merge request reports

0 Assignees

0 Reviewers

Request review from

Labels

None

Select labels

Manage project labels

Milestone

None

Time tracking

No estimate or time spent

0 Participants

Viewing commit 2f9957ca

Prev Next

Show latest version

Compare changes

Side-by-side
Inline

Show whitespace changes

Show one file at a time

Files

130

Search (e.g. *.vue) (Ctrl+P)

2f9957ca

Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-06 · 2f9957ca

🤖 GitLab Bot 🤖 authored 6 years ago

# Conflicts:
#	app/views/projects/project_members/index.html.haml
#	config/routes/api.rb
#	doc/api/namespaces.md
#	doc/api/protected_branches.md
#	doc/ci/variables/README.md
#	doc/system_hooks/system_hooks.md
#	doc/user/project/protected_branches.md
#	lib/api/protected_branches.rb
#	locale/gitlab.pot

[ci skip]