Reolve conflicts

Signed-off-by: Rémy Coutable <remy@rymai.me>

LICENSE

-<<<<<<< HEAD
 The GitLab Enterprise Edition (EE) license (the “EE License”)
-Copyright (c) 2011-2016 GitLab B.V.
-=======
 Copyright (c) 2011-2017 GitLab B.V.
->>>>>>> ce/master
 This software and associated documentation files (the "Software") may only be
 used if you (and any entity that you represent) have agreed to, and are in

app/controllers/projects/protected_branches_controller.rb

@@ -69,19 +69,12 @@ def load_protected_branches
   def access_levels_options
     {
-<<<<<<< HEAD
-      push_access_levels: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } },
-      merge_access_levels: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } },
-      selected_merge_access_levels: @protected_branch.merge_access_levels.map { |access_level| access_level.user_id || access_level.access_level },
-      selected_push_access_levels: @protected_branch.push_access_levels.map { |access_level| access_level.user_id || access_level.access_level }
-=======
       push_access_levels: {
         "Roles" => ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } },
       },
       merge_access_levels: {
         "Roles" => ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }
       }
->>>>>>> ce/master
     }
   end

app/views/search/results/_blob.html.haml

@@ -10,11 +10,6 @@
 .blob-result
   .file-holder
     .js-file-title.file-title
-<<<<<<< HEAD
-=======
-      - ref = @search_results.repository_ref
-      - blob_link = namespace_project_blob_path(@project.namespace, @project, tree_join(ref, file_name))
->>>>>>> ce/master
       = link_to blob_link do
         = icon('fa-file')
         %strong

spec/requests/api/groups_spec.rb

@@ -36,20 +36,21 @@
         expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
         expect(json_response.length).to eq(1)
-<<<<<<< HEAD
-        expect(json_response.first['name']).to eq(group1.name)
-
-        expect(json_response.first['ldap_cn']).to eq(group1.ldap_cn)
-        expect(json_response.first['ldap_access']).to eq(group1.ldap_access)
-
-        ldap_group_link = json_response.first['ldap_group_links'].first
-        expect(ldap_group_link['cn']).to eq(group1.ldap_cn)
-        expect(ldap_group_link['group_access']).to eq(group1.ldap_access)
-        expect(ldap_group_link['provider']).to eq('ldap')
-=======
         expect(json_response)
           .to satisfy_one { |group| group['name'] == group1.name }
->>>>>>> ce/master
+
+        expect(json_response)
+          .to satisfy_one { |group| group['ldap_cn'] == group1.ldap_cn }
+        expect(json_response)
+          .to satisfy_one { |group| group['ldap_access'] == group1.ldap_access }
+
+        expect(json_response).to satisfy_one do |group|
+          ldap_group_link = group['ldap_group_links'].first
+
+          ldap_group_link['cn'] == group1.ldap_cn &&
+            ldap_group_link['group_access'] == group1.ldap_access &&
+            ldap_group_link['provider'] == 'ldap'
+        end
       end
       it "does not include statistics" do
@@ -92,12 +93,8 @@
         expect(response).to have_http_status(200)
         expect(json_response).to be_an Array
-<<<<<<< HEAD
-        expect(json_response.find { |r| r['id'] == group1.id }['statistics']).to eq attributes.stringify_keys
-=======
         expect(json_response)
           .to satisfy_one { |group| group['statistics'] == attributes }
->>>>>>> ce/master
       end
     end

[username-removed-128633]

@alfredo1 @timothyandrew It seemed that selected_merge_access_levels and selected_push_access_levels are not used anymore since 468d727a (it was originally added by f7547d81).

Please check and confirm.

[username-removed-128633]

@alfredo1 I think the resolution was wrong and I believe I fixed it in dc09e7a0.

I think the discrepancies between CE and EE for the Protected Branches feature should be reduced. I've filed https://gitlab.com/gitlab-org/gitlab-ee/issues/1720 to track that.

[username-removed-408881]

yeah, Protected Branches needs some refactor to avoid conflicts every once in a while. I'll keep an eye on the issue

[username-removed-407765]

Thanks, @alfredo!

@rymai: I agree, it would be great if this doesn't happen anymore/as often.

[username-removed-128633]

@vsizov Please confirm the resolution is correct. Thanks!

[Valery Sizov]

Yes, it's correct :)