5 files changed, 18 insertions, 22 deletions

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a2b83c50c2e..7b4747ce3d7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -156,8 +156,8 @@ module ProjectsHelper
     end
   end
 
-  def repository_size(project = nil)
-    "#{(project || @project).repository_size} MB"
+  def repository_size(project = @project)
+    "#{project.repository_size} MB"
   rescue
     # In order to prevent 500 error
     # when application cannot allocate memory
diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml
index e9974c85733..af2545a22d8 100644
--- a/app/views/layouts/ci/_nav_admin.html.haml
+++ b/app/views/layouts/ci/_nav_admin.html.haml
@@ -8,26 +8,26 @@
   %li.separate-item
   = nav_link path: 'projects#index' do
     = link_to ci_admin_projects_path do
-      %i.fa.fa-list-alt
+      = icon('list-alt fw')
       Projects
   = nav_link path: 'events#index' do
     = link_to ci_admin_events_path do
-      %i.fa.fa-book
+      = icon('book fw')
       Events
   = nav_link path: ['runners#index', 'runners#show'] do
     = link_to ci_admin_runners_path do
-      %i.fa.fa-cog
+      = icon('cog fw')
       Runners
       %small.pull-right
         = Ci::Runner.count(:all)
   = nav_link path: 'builds#index' do
     = link_to ci_admin_builds_path do
-      %i.fa.fa-link
+      = icon('link fw')
       Builds
       %small.pull-right
         = Ci::Build.count(:all)
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to ci_admin_application_settings_path do
-      %i.fa.fa-cogs
+      = icon('cogs fw')
       %span
         Settings
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml
index d747679c8cf..b7e997be108 100644
--- a/app/views/layouts/ci/_nav_project.html.haml
+++ b/app/views/layouts/ci/_nav_project.html.haml
@@ -6,48 +6,48 @@
   %li.separate-item
   = nav_link path: ['projects#show', 'commits#show', 'builds#show'] do
     = link_to ci_project_path(@project) do
-      %i.fa.fa-list-alt
+      = icon('list-alt fw')
       %span
         Commits
-        %small.pull-right= @project.commits.count
+        %span.count= @project.commits.count
   = nav_link path: 'charts#show' do
     = link_to ci_project_charts_path(@project) do
-      %i.fa.fa-bar-chart
+      = icon('bar-chart fw')
       %span
         Charts
   = nav_link path: ['runners#index', 'runners#show', 'runners#edit'] do
     = link_to ci_project_runners_path(@project) do
-      %i.fa.fa-cog
+      = icon('cog fw')
       %span
         Runners
   = nav_link path: 'variables#show' do
     = link_to ci_project_variables_path(@project) do
-      %i.fa.fa-code
+      = icon('code fw')
       %span
         Variables
   = nav_link path: 'web_hooks#index' do
     = link_to ci_project_web_hooks_path(@project) do
-      %i.fa.fa-link
+      = icon('link fw')
       %span
         Web Hooks
   = nav_link path: 'triggers#index' do
     = link_to ci_project_triggers_path(@project) do
-      %i.fa.fa-retweet
+      = icon('retweet fw')
       %span
         Triggers
   = nav_link path: ['services#index', 'services#edit'] do
     = link_to ci_project_services_path(@project) do
-      %i.fa.fa-share
+      = icon('share fw')
       %span
         Services
   = nav_link path: 'events#index' do
     = link_to ci_project_events_path(@project) do
-      %i.fa.fa-book
+      = icon('book fw')
       %span
         Events
   %li.separate-item
   = nav_link path: 'projects#edit' do
     = link_to edit_ci_project_path(@project) do
-      %i.fa.fa-cogs
+      = icon('cogs fw')
       %span
         Settings
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index c1d5428f676..6e53f55b0ab 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -30,8 +30,4 @@
 
     = render 'projects/buttons/dropdown'
 
-    - if @project.gitlab_ci?
-      = link_to ci_project_path(@project.gitlab_ci_project), class: 'btn btn-default' do
-        CI
-
   = render "shared/clone_panel"
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index aa5914e3ed9..6a5fc689803 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -24,7 +24,7 @@
         = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
 
     %li
-      = link_to namespace_project_path(@project.namespace, @project) do
+      = link_to project_files_path(@project) do
         = repository_size
 
     - if !prefer_readme? && @repository.readme