Fix conflict

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?

doc/api/namespaces.md

@@ -55,11 +55,7 @@ Example response:
 ]
 ```
 
-<<<<<<< HEAD
 **Note**: `members_count_with_descendants` and `plan` are presented only for group maintainers/owners.
-=======
-**Note**: `members_count_with_descendants` are presented only for group maintainers/owners.
->>>>>>> upstream/master
 
 ## Search for namespace
 

doc/api/protected_branches.md

@@ -9,10 +9,7 @@ The access levels are defined in the `ProtectedRefAccess::ALLOWED_ACCESS_LEVELS`
 0  => No access
 30 => Developer access
 40 => Maintainer access
-<<<<<<< HEAD
 60 => Admin access
-=======
->>>>>>> upstream/master
 ```
 
 ## List protected branches
@@ -40,25 +37,17 @@ Example response:
     "push_access_levels": [
       {
         "access_level": 40,
-<<<<<<< HEAD
         "user_id": null,
         "group_id": null,
-=======
->>>>>>> upstream/master
         "access_level_description": "Maintainers"
       }
     ],
     "merge_access_levels": [
       {
-<<<<<<< HEAD
         "access_level": null,
         "user_id": null,
         "group_id": 1234,
         "access_level_description": "Example Merge Group"
-=======
-        "access_level": 40,
-        "access_level_description": "Maintainers"
->>>>>>> upstream/master
       }
     ]
   },
@@ -91,25 +80,17 @@ Example response:
   "push_access_levels": [
     {
       "access_level": 40,
-<<<<<<< HEAD
       "user_id": null,
       "group_id": null,
-=======
->>>>>>> upstream/master
       "access_level_description": "Maintainers"
     }
   ],
   "merge_access_levels": [
     {
-<<<<<<< HEAD
       "access_level": null,
       "user_id": null,
       "group_id": 1234,
       "access_level_description": "Example Merge Group"
-=======
-      "access_level": 40,
-      "access_level_description": "Maintainers"
->>>>>>> upstream/master
     }
   ]
 }
@@ -134,14 +115,11 @@ curl --request POST --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" 'https://gitl
 | `name` | string | yes | The name of the branch or wildcard |
 | `push_access_level` | string | no | Access levels allowed to push (defaults: `40`, maintainer access level) |
 | `merge_access_level` | string | no | Access levels allowed to merge (defaults: `40`, maintainer access level) |
-<<<<<<< HEAD
 | `unprotect_access_level` | string | no | Access levels allowed to unprotect (defaults: `40`, maintainer access level) |
 | `allowed_to_push` | array | no | Array of access levels allowed to push, with each described by a hash |
 | `allowed_to_merge` | array | no | Array of access levels allowed to merge, with each described by a hash |
 | `allowed_to_unprotect` | array | no | Array of access levels allowed to unprotect, with each described by a hash |
 
-=======
->>>>>>> upstream/master
 
 Example response:
 
@@ -151,18 +129,14 @@ Example response:
   "push_access_levels": [
     {
       "access_level": 30,
-<<<<<<< HEAD
       "user_id": null,
       "group_id": null,
-=======
->>>>>>> upstream/master
       "access_level_description": "Developers + Maintainers"
     }
   ],
   "merge_access_levels": [
     {
       "access_level": 30,
-<<<<<<< HEAD
       "user_id": null,
       "group_id": null,
       "access_level_description": "Developers + Maintainers"
@@ -213,9 +187,6 @@ Example response:
       "user_id":null,
       "group_id":null,
       "access_level_description":"Maintainers"
-=======
-      "access_level_description": "Developers + Maintainers"
->>>>>>> upstream/master
     }
   ]
 }

doc/system_hooks/system_hooks.md

@@ -138,11 +138,7 @@ Please refer to `group_rename` and `user_rename` for that case.
                   "created_at": "2012-07-21T07:30:56Z",
                   "updated_at": "2012-07-21T07:38:22Z",
                   "event_name": "user_add_to_team",
-<<<<<<< HEAD
                 "access_level": "Maintainer",
-=======
-              "project_access": "Maintainer",
->>>>>>> upstream/master
                   "project_id": 74,
                 "project_name": "StoreCloud",
                 "project_path": "storecloud",

doc/user/project/protected_branches.md

@@ -65,7 +65,6 @@ dropdown list in the "Already protected" area.
 
 If you don't choose any of those options while creating a protected branch,
 they are set to "Maintainers" by default.
-<<<<<<< HEAD
 
 ## Restricting push and merge access to certain users **[STARTER]**
 
@@ -81,8 +80,6 @@ access.
 Click **Protect** and the branch will appear in the "Protected branch" list.
 
 ![Roles and users list](img/protected_branches_select_roles_and_users_list.png)
-=======
->>>>>>> upstream/master
 
 ## Wildcard protected branches
 

lib/api/protected_branches.rb

@@ -45,7 +45,6 @@ module API
         optional :merge_access_level, type: Integer,
                                       values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS,
                                       desc: 'Access levels allowed to merge (defaults: `40`, maintainer access level)'
-<<<<<<< HEAD
         optional :unprotect_access_level, type: Integer,
                                           values: ProtectedRefAccess::ALLOWED_ACCESS_LEVELS,
                                           desc: 'Access levels allowed to unprotect (defaults: `40`, maintainer access level)'
@@ -64,8 +63,6 @@ module API
           optional :user_id, type: Integer
           optional :group_id, type: Integer
         end
-=======
->>>>>>> upstream/master
       end
       post ':id/protected_branches' do
         protected_branch = user_project.protected_branches.find_by(name: params[:name])

locale/gitlab.pot

@@ -516,7 +516,6 @@ msgstr ""
 msgid "Artifacts"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Ascending"
 msgstr ""
 
@@ -524,9 +523,6 @@ msgid "Ask your group maintainer to setup a group Runner."
 msgstr ""
 
 msgid "Assertion consumer service URL"
-=======
-msgid "Ask your group maintainer to setup a group Runner."
->>>>>>> upstream/master
 msgstr ""
 
 msgid "Assign custom color like #FF0000"
@@ -2570,11 +2566,7 @@ msgstr ""
 msgid "GeoNodes|Loading nodes"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "GeoNodes|Local LFS objects"
-=======
-msgid "Group maintainers can register group runners in the %{link}"
->>>>>>> upstream/master
 msgstr ""
 
 msgid "GeoNodes|Local attachments"