From 746dd89ab010299f731c195082087d32f25698df Mon Sep 17 00:00:00 2001
From: DJ Mountney <dmountney@perforce.com>
Date: Mon, 23 Feb 2015 16:19:03 -0800
Subject: [PATCH 1/2] Fix 404 when deleting a project

The deletion from the admin section was redirecting to the wrong address.
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 38341b1c8c..d1583e6ebf 100644
--- a/app/controllers/projects_controller.rb
+++ b/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

From f6add983d332758cd1ae22732da762cff608af1e Mon Sep 17 00:00:00 2001
From: Marcin Kulik <m@ku1ik.com>
Date: Tue, 24 Feb 2015 09:42:07 +0000
Subject: [PATCH 2/2] Use proper Gitorious icons on import pages

---
 app/assets/images/gitorious-logo-black.png  | Bin 0 -> 809 bytes
 app/assets/images/gitorious-logo-blue.png   | Bin 0 -> 495 bytes
 app/assets/stylesheets/sections/import.scss |  18 ++++++++++++++++++
 app/views/import/gitorious/status.html.haml |   2 +-
 app/views/projects/new.html.haml            |   2 +-
 5 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/images/gitorious-logo-black.png
 create mode 100644 app/assets/images/gitorious-logo-blue.png
 create mode 100644 app/assets/stylesheets/sections/import.scss

diff --git a/app/assets/images/gitorious-logo-black.png b/app/assets/images/gitorious-logo-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..78f17a9af79dc2395acd9bcc2a391589dd6b6ed8
GIT binary patch
literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ00002VoOIv0RM-N
z%)bBt010qNS#tmYE+YT{E+YYWr9XB6000McNliru-vSp7CJ;<ThE@Oo0=h{=K~!ko
z?U_wTR8bVifA5W`St<z;AsnbpM2gfR`XT}&B}uGJU`T|mOAsm|f~fZHYSW^i77=|B
zmJn2s6IhU#n<5iWi=>G*X{kliLPwpCH_Ux^-m~D{fnn~wbKd#g`|kapbKi6DEOLf+
zN&$y=oMu=FqBx%JuhX%pIz@#hg8*<nd-kN&%4rN_0`dT4_N)jSAfyrjL;w+hC4dw|
ziscH;IV8E3SX%unKeGPwlNLr4L6OJQ;Q$MQo&75bOfkSo{VdGJ7Dvu=&T0siIsp=A
zn~_x??R*2p<(TCh9s!`i(5i_qtX05enI%94042tDF+NK5QtyI?#Q<<DY<EhX%cv#5
zdjKYUS~th4N9eE^#VhRwf!{RwvY&K7N;yh-Mn{s1RHn6DWhe`@Utg#8vn;2L7~sr(
zT-^C@h*3f(8?pf6PU-?#8aK}Bw1zglpGyf%QdK#?os6cJu39ZNvrJj<(zn#X=+ROG
zB%^#F0{D*rrZehqLIsdiqOqX)V-g5}M<Su{OxDp!8Q}0%uL&9^0Dz8i*01Om9yLk|
zGnkKg02er97{F(^q&IUTcmgQ$gw1oQ`6S2Xw$8Q=8YiFtH)M-;8SMh;rID3XQAHJN
zxHXF+>wUQgI3eX`+i+7xFy6Z;2lf|+O3eT=?{Zlr#Q=P_NZ+T60H7bTbD9FnDV;VH
zA`f-gCtb7}g3r*Sy@opADbZ*TJ;hVP&=#Ra2}uMH0sJEX7DqETm;o1l*~3KvX!H+o
zQ0i^HOB?%bV!@DH<~e@foyBO$F^fs>*LGt_2#fNb_bvDo%C3kzo=3CYJPiS$A<qFr
zhS?bO_;rW(8i0C+0(Cz_4U>6~ShAh|z})|$Rug%3K+rg~Bm!|iNR1|hf}VBDE?U{j
nDy!$>sq%+$UhqH%QaR#Z&H$a*+H(Ht00000NkvXXu0mjfir-pq

literal 0
HcmV?d00001

diff --git a/app/assets/images/gitorious-logo-blue.png b/app/assets/images/gitorious-logo-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..4962cffba3153927ddd8cd5ff295fe4ca142bfa8
GIT binary patch
literal 495
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=De8Ak0{?)V>TT$X?><>&kwgNu1AE_|Z?p9}EnPHJ&bxAr-gY&e|w=$biT7sZ8;T
z6d|?~LR)eirt)S)HZdA`dg%&j74B4Skjc^Z`<EXZQ8g_!vTOmXRqVUR%Qrr}$SSxn
z>dKOmc^xlq#JR8X;C&kdv<VLMlG4f<4hG$OHszk|jF~Pft9Adrl_{Ag&fx!idE3;O
z4xoM|CBd8Nd=}fT2QE(7?isL{clm*NbM0f_DJv!DsyBrDK8RvJGxzk;+)CpEvut%&
zXRTx@HVs&-Abp-M@7&I{-3=-naN8KvB43s2=9_amxa<pyDBk+_mgqLIOP5(U++pYY
z@ADzsXS>r$f8mXRJ2aS*_MNDR*_yoTOyvF(6<;Njo*gv=n{#vX#_O67_!?$*J9p?F
z<+tp;ShYZ<<wj6Vv8BQ{xh7=G7$yW||ES5_s(9sv%r*uF3&s^MPo7@&<UNz=%KdYl
zzlhxk5;6GvY5T!jiyd}{oDC|9<2@g8E?Y&taM84k8PyiGOh&yM;;fnr_JQ2*>FVdQ
I&MBb@0GSiJ)c^nh

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/sections/import.scss b/app/assets/stylesheets/sections/import.scss
new file mode 100644
index 0000000000..3df4bb84bd
--- /dev/null
+++ b/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;
+}
diff --git a/app/views/import/gitorious/status.html.haml b/app/views/import/gitorious/status.html.haml
index 35ed0a717d..8ede5c3e84 100644
--- a/app/views/import/gitorious/status.html.haml
+++ b/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
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 33162ded4a..c37ae8d31d 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -70,7 +70,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