CE Upstream - Friday
Resolved conflicts:
UU LICENSE
UU app/controllers/projects/protected_branches_controller.rb
UU app/views/search/results/_blob.html.haml
UU spec/requests/api/groups_spec.rbMerge request reports
Activity
69 69 70 70 def access_levels_options 71 71 { 72 <<<<<<< HEAD 73 push_access_levels: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } }, 74 merge_access_levels: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } }, 75 selected_merge_access_levels: @protected_branch.merge_access_levels.map { |access_level| access_level.user_id || access_level.access_level }, 76 selected_push_access_levels: @protected_branch.push_access_levels.map { |access_level| access_level.user_id || access_level.access_level } @alfredo1 @timothyandrew It seemed that
selected_merge_access_levelsandselected_push_access_levelsare not used anymore since 468d727a (it was originally added by f7547d81).Please check and confirm.
@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.
yeah, Protected Branches needs some refactor to avoid conflicts every once in a while. I'll keep an eye on the issue
Edited by username-removed-408881
10 10 .blob-result 11 11 .file-holder 12 12 .js-file-title.file-title 13 <<<<<<< HEAD 14 ======= 15 - ref = @search_results.repository_ref 16 - blob_link = namespace_project_blob_path(@project.namespace, @project, tree_join(ref, file_name)) 17 >>>>>>> ce/master @vsizov Please confirm the resolution is correct. Thanks!
@rymai many, many spec failures :/. Also, I'm not a maintainer, so can't merge this in any event.
assigned to @rymai
