kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Marin Jankovski 2015-02-24 16:54:26 -08:00
parent 4aeb916566 b7dd0decf8
commit 82483f9536
6 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/gitorious-logo-black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 809 B

BIN
app/assets/images/gitorious-logo-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 495 B

18
app/assets/stylesheets/sections/import.scss vendored Normal file
View File

@ -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;
}

2
app/controllers/projects_controller.rb
View File

@ -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

2
app/views/import/gitorious/status.html.haml
View File

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

2
app/views/projects/new.html.haml
View File

@ -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