Merge fixes after ce-upstream update

app/views/layouts/nav/_group_settings.html.haml

@@ -16,24 +16,24 @@
               = link_to 'Projects', projects_group_path(@group), title: 'Projects'
           - if (can_edit || can_leave) && can_admin_group
             %li.divider
-            - if can_edit
-              - if ldap_enabled?
-                = nav_link(controller: :ldap_group_links) do
-                  = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
-                    %span
-                      LDAP Groups
-              = nav_link(controller: :hooks) do
-                = link_to group_hooks_path(@group), title: "Webhooks" do
+          - if can_edit
+            - if ldap_enabled?
+              = nav_link(controller: :ldap_group_links) do
+                = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
                   %span
-                    Webhooks
-              = nav_link(controller: :audit_events) do
-                = link_to group_audit_events_path(@group), title: "Audit Events" do
-                  %span
-                    Audit Events
-              %li
-                = link_to 'Edit Group', edit_group_path(@group)
-            - if can_leave
-              %li
-                = link_to polymorphic_path([:leave, @group, :members]),
-                  data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
-                  Leave Group
+                    LDAP Groups
+            = nav_link(controller: :hooks) do
+              = link_to group_hooks_path(@group), title: "Webhooks" do
+                %span
+                  Webhooks
+            = nav_link(controller: :audit_events) do
+              = link_to group_audit_events_path(@group), title: "Audit Events" do
+                %span
+                  Audit Events
+            %li
+              = link_to 'Edit Group', edit_group_path(@group)
+          - if can_leave
+            %li
+              = link_to polymorphic_path([:leave, @group, :members]),
+                data: { confirm: leave_confirmation_message(@group) }, method: :delete, title: 'Leave group' do
+                Leave Group

spec/controllers/projects/merge_requests_controller_spec.rb

@@ -133,7 +133,6 @@ describe Projects::MergeRequestsController do
           id: merge_request.iid,
           format: 'html'
       expect(assigns(:labels)).not_to be_nil
->>>>>>> ce/master
     end
   end