diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 17:40:06 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 17:40:06 +0000 |
| commit | f05168b1a16d11c74f13b6265409bb55b14400cf (patch) | |
| tree | 820c2a1b9f7c8d41c89b42baa9e9b8d8fe724831 | |
| parent | 386178aedf917870af2517af8dda088d76b7041c (diff) | |
| parent | d3c44b1a6c470990cd79d2e4feec3d1d9b450496 (diff) | |
| download | gitlab-ce-f05168b1a16d11c74f13b6265409bb55b14400cf.tar.gz | |
Merge branch 'import-status-page-link' into 'master'
Fix import status page project links for new Rails.
Fixes #2059.
See merge request !1593
| -rw-r--r-- | app/views/import/base/create.js.haml | 2 | ||||
| -rw-r--r-- | app/views/import/bitbucket/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/github/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/gitlab/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/import/gitorious/status.html.haml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml index 8ebdf4f1a20..8d10722628f 100644 --- a/app/views/import/base/create.js.haml +++ b/app/views/import/base/create.js.haml @@ -20,6 +20,6 @@ job.attr("id", "project_#{@project.id}") target_field = job.find(".import-target") target_field.empty() - target_field.append('<strong>#{link_to @project.path_with_namespace, @project}</strong>') + target_field.append('<strong>#{link_to @project.path_with_namespace, [@project.namespace.becomes(Namespace), @project]}</strong>') $("table.import-jobs tbody").prepend(job) job.addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started") diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml index 90c97393b51..bcbbaadf3e0 100644 --- a/app/views/import/bitbucket/status.html.haml +++ b/app/views/import/bitbucket/status.html.haml @@ -20,7 +20,7 @@ %td = link_to project.import_source, "https://bitbucket.org/#{project.import_source}", target: "_blank" %td - %strong= link_to project.path_with_namespace, project + %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %td.job-status - if project.import_status == 'finished' %span.cgreen diff --git a/app/views/import/github/status.html.haml b/app/views/import/github/status.html.haml index 957022f382f..883090a3026 100644 --- a/app/views/import/github/status.html.haml +++ b/app/views/import/github/status.html.haml @@ -20,7 +20,7 @@ %td = link_to project.import_source, "https://github.com/#{project.import_source}", target: "_blank" %td - %strong= link_to project.path_with_namespace, project + %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %td.job-status - if project.import_status == 'finished' %span.cgreen diff --git a/app/views/import/gitlab/status.html.haml b/app/views/import/gitlab/status.html.haml index db161681206..41ac073eae1 100644 --- a/app/views/import/gitlab/status.html.haml +++ b/app/views/import/gitlab/status.html.haml @@ -20,7 +20,7 @@ %td = link_to project.import_source, "https://gitlab.com/#{project.import_source}", target: "_blank" %td - %strong= link_to project.path_with_namespace, project + %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %td.job-status - if project.import_status == 'finished' %span.cgreen diff --git a/app/views/import/gitorious/status.html.haml b/app/views/import/gitorious/status.html.haml index e06e068fdb4..ebe24747a05 100644 --- a/app/views/import/gitorious/status.html.haml +++ b/app/views/import/gitorious/status.html.haml @@ -20,7 +20,7 @@ %td = link_to project.import_source, "https://gitorious.org/#{project.import_source}", target: "_blank" %td - %strong= link_to project.path_with_namespace, project + %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %td.job-status - if project.import_status == 'finished' %span.cgreen |