Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-21 13:07:35 +0300
committerDouwe Maan <douwe@gitlab.com>2015-02-24 17:07:25 +0300
commitbc80efb1fd2978a328fdc89a3164f60bcf7ed604 (patch)
tree618239103c1987c0db807508b08cbfc3d7e9409f
parent20691df230332022cb4d5008d84c7ee6e6c8dbfd (diff)
Bring Gitorious import page in line with others.
-rw-r--r--app/views/import/gitorious/status.html.haml11
-rw-r--r--app/views/projects/new.html.haml2
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/import/gitorious/status.html.haml b/app/views/import/gitorious/status.html.haml
index 35ed0a717de..c7617ca43df 100644
--- a/app/views/import/gitorious/status.html.haml
+++ b/app/views/import/gitorious/status.html.haml
@@ -1,6 +1,6 @@
%h3.page-title
%i.fa.fa-gitorious
- Import repositories from Gitorious.org
+ Import projects from Gitorious
%p.light
Select projects you want to import.
@@ -17,7 +17,8 @@
%tbody
- @already_added_projects.each do |project|
%tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
- %td= project.import_source
+ %td
+ = link_to project.import_source, "https://gitorious.org/#{project.import_source}", target: "_blank"
%td
%strong= link_to project.path_with_namespace, project
%td.job-status
@@ -25,12 +26,16 @@
%span.cgreen
%i.fa.fa-check
done
+ - elsif project.import_status == 'started'
+ %i.fa.fa-spinner.fa-spin
+ started
- else
= project.human_import_status_name
- @repos.each do |repo|
%tr{id: "repo_#{repo.id}"}
- %td= repo.full_name
+ %td
+ = link_to repo.full_name, "https://gitorious.org/#{repo.full_name}", target: "_blank"
%td.import-target
= repo.full_name
%td.import-actions.job-status
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 875c092fd1a..f3d166ffb8f 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -85,7 +85,7 @@
.col-sm-10
= link_to new_import_gitorious_path do
%i.fa.fa-heart
- Import projects from Gitorious.org
+ Import projects from Gitorious
%hr.prepend-botton-10