CE upstream - 2018-06-06 15:12 UTC
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.
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!
Merge request reports
Activity
marked the checklist item @reprazent Please resolve (UU)
config/routes/api.rb
as completedmarked the checklist item @axil Please resolve (UU)
doc/ci/variables/README.md
as completedmarked the checklist item @lulalala Please resolve (UU)
app/views/projects/project_members/index.html.haml
as completedmarked the checklist item @lulalala Please resolve (UU)
doc/api/namespaces.md
as completedmarked the checklist item @lulalala Please resolve (UU)
doc/api/protected_branches.md
as completedmarked the checklist item @lulalala Please resolve (UU)
doc/system_hooks/system_hooks.md
as completedmarked the checklist item @lulalala Please resolve (UU)
doc/user/project/protected_branches.md
as completedmarked the checklist item @lulalala Please resolve (UU)
lib/api/protected_branches.rb
as completedmarked the checklist item @lulalala Please resolve (UU)
locale/gitlab.pot
as completedHi @rymai could you review this? Thanks.
assigned to @rymai
added 20 commits
-
c3931889...f3c7ab45 - 19 commits from branch
master
- 2f448ee7 - Merge branch 'master' into ce-to-ee-2018-06-06
-
c3931889...f3c7ab45 - 19 commits from branch
@lulalala Thank you, looks good to me!
❤ 💛 💚 🚀 mentioned in commit e1f53011
added feature freeze label
added Enterprise Edition label