Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/assets/stylesheets/sections/import.scss

@@ -0,0 +1,18 @@
+i.icon-gitorious {
+  display: inline-block;
+  background-position: 0px 0px;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+
+i.icon-gitorious-small {
+  background-image: image-url('gitorious-logo-blue.png');
+  width: 13px;
+  height: 13px;
+}
+
+i.icon-gitorious-big {
+  background-image: image-url('gitorious-logo-black.png');
+  width: 18px;
+  height: 18px;
+}

app/controllers/projects_controller.rb

@@ -102,7 +102,7 @@ class ProjectsController < ApplicationController
         flash[:alert] = 'Project deleted.'
 
         if request.referer.include?('/admin')
-          redirect_to admin_namespace_projects_path
+          redirect_to admin_namespaces_projects_path
         else
           redirect_to projects_dashboard_path
         end

app/views/import/gitorious/status.html.haml

@@ -1,5 +1,5 @@
 %h3.page-title
-  %i.fa.fa-gitorious
+  %i.icon-gitorious.icon-gitorious-big
   Import repositories from Gitorious.org
 
 %p.light

app/views/projects/new.html.haml

@@ -71,7 +71,7 @@
         .col-sm-2
         .col-sm-10
           = link_to new_import_gitorious_path do
-            %i.fa.fa-heart
+            %i.icon-gitorious.icon-gitorious-small
             Import projects from Gitorious.org
 
       %hr.prepend-botton-10