Resolve conflict in group settings dropdown

a607a11e · Yorick Peterse · 2cd370fb · a607a11e
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
-<<<<<<< HEAD
-%ul.nav.nav-sidebar
-  = nav_link do
-    = link_to group_path(@group), title: 'Go to group', class: 'back-link' do
-      = icon('caret-square-o-left fw')
-      %span
-        Go to group
-
-  %li.separate-item
-
-  %ul.sidebar-subnav
-    = nav_link(path: 'groups#edit') do
-      = link_to edit_group_path(@group), title: 'Group Settings' do
-        = icon ('pencil-square-o fw')
-        %span
-          Group Settings
-    = nav_link(path: 'groups#projects') do
-      = link_to projects_group_path(@group), title: 'Projects' do
-        = icon('folder fw')
-        %span
-          Projects
-    - if ldap_enabled?
-      = nav_link(controller: :ldap_group_links) do
-        = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
-          %i.fa.fa-exchange
-          %span
-            LDAP Groups
-    = nav_link(controller: :hooks) do
-      = link_to group_hooks_path(@group), title: "Webhooks" do
-        %i.fa.fa-link
-        %span
-          Webhooks
-    = nav_link(controller: :audit_events) do
-      = link_to group_audit_events_path(@group), title: "Audit Events" do
-        %i.fa.fa-file-text-o
-        %span
-          Audit Events
-=======
 - if current_user
  - if access = @group.users.find_by(id: current_user.id)
    .controls
@@ -52,8 +14,23 @@
            %li
              = link_to edit_group_path(@group) do
                Edit Group
+            - if ldap_enabled?
+              = nav_link(controller: :ldap_group_links) do
+                = link_to group_ldap_group_links_path(@group), title: "LDAP Groups" do
+                  %i.fa.fa-exchange
+                  %span
+                    LDAP Groups
+            = nav_link(controller: :hooks) do
+              = link_to group_hooks_path(@group), title: "Webhooks" do
+                %i.fa.fa-link
+                %span
+                  Webhooks
+            = nav_link(controller: :audit_events) do
+              = link_to group_audit_events_path(@group), title: "Audit Events" do
+                %i.fa.fa-file-text-o
+                %span
+                  Audit Events
          %li
            = link_to leave_group_group_members_path(@group),
              data: { confirm: leave_group_message(@group.name) }, method: :delete, title: 'Leave group' do
              Leave Group
->>>>>>> e77a9a342e175c7274350ef6d655bde496eca778