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.

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!

app/views/projects/project_members/index.html.haml

@@ -3,7 +3,6 @@
 
 .row.prepend-top-default
   .col-lg-12
-<<<<<<< HEAD
     - if project_can_be_shared?
       %h4
         Project members
@@ -16,21 +15,6 @@
           or
           %i Owners
 
-=======
-    %h4
-      Project members
-    - if can?(current_user, :admin_project_member, @project)
-      %p
-        You can add a new member to
-        %strong= @project.name
-        or share it with another group.
-    - else
-      %p
-        Members can be added by project
-        %i Maintainers
-        or
-        %i Owners
->>>>>>> upstream/master
     .light
       - if can_admin_project_members && project_can_be_shared?
         - if !membership_locked? && @project.allowed_to_share_with_group?