From bc47e86966408786c3941b9c9e622056102f479c Mon Sep 17 00:00:00 2001
From: Darby <darbsies@gmail.com>
Date: Fri, 26 Jun 2015 15:05:57 -0700
Subject: [PATCH 1/3] Fixed the alignment of project settings icons

---
 app/views/layouts/nav/_project_settings.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index cf64d7abd3..d6f51b249e 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -15,7 +15,7 @@
           Project Settings
     = nav_link(controller: :group_links) do
       = link_to namespace_project_group_links_path(@project.namespace, @project) do
-        %i.fa.fa-share-square-o
+        =icon('share-square fw')
         %span
           Groups
     = nav_link(controller: :deploy_keys) do
@@ -30,7 +30,7 @@
           Web Hooks
     = nav_link(controller: :git_hooks) do
       = link_to namespace_project_git_hooks_path(@project.namespace, @project) do
-        %i.fa.fa-git-square
+        = icon('git-square fw')
         %span
           Git Hooks
     = nav_link(controller: :services) do
@@ -45,6 +45,6 @@
           Protected branches
     = nav_link(controller: :audit_events) do
       = link_to namespace_project_audit_events_path(@project.namespace, @project) do
-        %i.fa.fa-file-text-o
+        = icon('file-text fw')
         %span
           Audit Events

From 083662f618bbadd512f8c895d8a73687641118ad Mon Sep 17 00:00:00 2001
From: Darby <darbsies@gmail.com>
Date: Mon, 29 Jun 2015 09:52:19 -0700
Subject: [PATCH 2/3] Fixed the icons

---
 app/views/layouts/nav/_project_settings.html.haml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index d6f51b249e..becc578050 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -15,7 +15,11 @@
           Project Settings
     = nav_link(controller: :group_links) do
       = link_to namespace_project_group_links_path(@project.namespace, @project) do
+<<<<<<< Updated upstream
         =icon('share-square fw')
+=======
+        = icon('share-square-o fw')
+>>>>>>> Stashed changes
         %span
           Groups
     = nav_link(controller: :deploy_keys) do
@@ -45,6 +49,10 @@
           Protected branches
     = nav_link(controller: :audit_events) do
       = link_to namespace_project_audit_events_path(@project.namespace, @project) do
+<<<<<<< Updated upstream
         = icon('file-text fw')
+=======
+        = icon('file-text-o fw')
+>>>>>>> Stashed changes
         %span
           Audit Events

From 758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb Mon Sep 17 00:00:00 2001
From: Darby <darbsies@gmail.com>
Date: Mon, 29 Jun 2015 11:24:45 -0700
Subject: [PATCH 3/3] Fixed merge request rejection

---
 app/views/layouts/nav/_project_settings.html.haml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index becc578050..99d364b074 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -15,11 +15,7 @@
           Project Settings
     = nav_link(controller: :group_links) do
       = link_to namespace_project_group_links_path(@project.namespace, @project) do
-<<<<<<< Updated upstream
-        =icon('share-square fw')
-=======
         = icon('share-square-o fw')
->>>>>>> Stashed changes
         %span
           Groups
     = nav_link(controller: :deploy_keys) do
@@ -49,10 +45,6 @@
           Protected branches
     = nav_link(controller: :audit_events) do
       = link_to namespace_project_audit_events_path(@project.namespace, @project) do
-<<<<<<< Updated upstream
-        = icon('file-text fw')
-=======
         = icon('file-text-o fw')
->>>>>>> Stashed changes
         %span
           Audit Events