diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml
index d8af0295b2d..ec7a2b86566 100644
--- a/app/views/import/base/create.js.haml
+++ b/app/views/import/base/create.js.haml
@@ -20,10 +20,10 @@
job.attr("id", "project_#{@project.id}")
target_field = job.find(".import-target")
target_field.empty()
- target_field.append('#{link_to @project.path_with_namespace, namespace_project_path(@project.namespace, @project)}')
+ target_field.append('#{link_to @project.path_with_namespace, namespace_project_path(@project.namespace, @project)}')
$("table.import-jobs tbody").prepend(job)
job.addClass("active").find(".import-actions").html(" started")
- else
:plain
job = $("tr#repo_#{@repo_id}")
- job.find(".import-actions").html(" Error saving project: #{escape_javascript(@project.errors.full_messages.join(','))}")
+ job.find(".import-actions").html(" Error saving project: #{escape_javascript(@project.errors.full_messages.join(','))}")
diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml
index 134d88481db..e24c01f3e0f 100644
--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -11,12 +11,12 @@
%p
- if @incompatible_repos.any?
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all compatible projects
+ = icon('spinner spin', class: 'loading-icon')
- else
= button_tag class: "btn btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -54,8 +54,8 @@
= "#{repo["owner"]}/#{repo["slug"]}"
%td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
- @incompatible_repos.each do |repo|
%tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"}
%td
diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml
index f5966fac65b..d842d1cbd94 100644
--- a/app/views/import/fogbugz/status.html.haml
+++ b/app/views/import/fogbugz/status.html.haml
@@ -14,8 +14,8 @@
%hr
%p
= button_tag class: 'btn btn-import btn-success js-import-all' do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -53,8 +53,8 @@
= "#{current_user.username}/#{repo.name}"
%td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
:javascript
new ImporterStatus("#{jobs_import_fogbugz_path}", "#{import_fogbugz_path}");
diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml
index 65432951ec8..d6fa0d8023b 100644
--- a/app/views/import/github/status.html.haml
+++ b/app/views/import/github/status.html.haml
@@ -9,8 +9,8 @@
%hr
%p
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -48,8 +48,8 @@
= repo.full_name
%td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
:javascript
new ImporterStatus("#{jobs_import_github_path}", "#{import_github_path}");
diff --git a/app/views/import/gitlab/status.html.haml b/app/views/import/gitlab/status.html.haml
index f20011f5684..8f79f385610 100644
--- a/app/views/import/gitlab/status.html.haml
+++ b/app/views/import/gitlab/status.html.haml
@@ -9,8 +9,8 @@
%hr
%p
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -48,8 +48,8 @@
= repo["path_with_namespace"]
%td.import-actions.job-status
= button_tag class: "btn js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
:javascript
new ImporterStatus("#{jobs_import_gitlab_path}", "#{import_gitlab_path}");
diff --git a/app/views/import/gitorious/status.html.haml b/app/views/import/gitorious/status.html.haml
index 725910ed213..f0256e0f934 100644
--- a/app/views/import/gitorious/status.html.haml
+++ b/app/views/import/gitorious/status.html.haml
@@ -9,8 +9,8 @@
%hr
%p
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -48,8 +48,8 @@
= repo.full_name
%td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
:javascript
new ImporterStatus("#{jobs_import_gitorious_path}", "#{import_gitorious_path}");
diff --git a/app/views/import/google_code/status.html.haml b/app/views/import/google_code/status.html.haml
index 2cb0931838b..c4ac1b4f9b7 100644
--- a/app/views/import/google_code/status.html.haml
+++ b/app/views/import/google_code/status.html.haml
@@ -15,12 +15,12 @@
%p
- if @incompatible_repos.any?
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all compatible projects
+ = icon('spinner spin', class: 'loading-icon')
- else
= button_tag class: "btn btn-import btn-success js-import-all" do
- = icon('spinner spin', class: 'loading-icon')
Import all projects
+ = icon('spinner spin', class: 'loading-icon')
.table-responsive
%table.table.import-jobs
@@ -58,8 +58,8 @@
= "#{current_user.username}/#{repo.name}"
%td.import-actions.job-status
= button_tag class: "btn btn-import js-add-to-import" do
- = icon('spinner spin', class: 'loading-icon')
Import
+ = icon('spinner spin', class: 'loading-icon')
- @incompatible_repos.each do |repo|
%tr{id: "repo_#{repo.id}"}
%td