summaryrefslogtreecommitdiff
path: root/app/views/import/bitbucket_server/status.html.haml
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-12 15:26:37 -0700
committerStan Hu <stanhu@gmail.com>2018-07-12 15:26:37 -0700
commitf85712fb9814170aac631c7c24ca287fe5a0eb04 (patch)
treec836ab64e01b11483e4c2fa5d5e10af37eec25b1 /app/views/import/bitbucket_server/status.html.haml
parentfd2c27ac557e295765bf1c99b416a72ffdd71359 (diff)
downloadgitlab-ce-f85712fb9814170aac631c7c24ca287fe5a0eb04.tar.gz
Use browse URL of project to link imports
Diffstat (limited to 'app/views/import/bitbucket_server/status.html.haml')
-rw-r--r--app/views/import/bitbucket_server/status.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index 81eac62c1ef..5f5597e557c 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -35,7 +35,7 @@
- @already_added_projects.each do |project|
%tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }
%td
- = link_to project.import_source, "https://bitbucket.org/#{project.import_source}", target: '_blank', rel: 'noopener noreferrer'
+ = link_to project.import_source, project.import_source, target: '_blank', rel: 'noopener noreferrer'
%td
= link_to project.full_path, [project.namespace.becomes(Namespace), project]
%td.job-status
@@ -73,14 +73,14 @@
- @incompatible_repos.each do |repo|
%tr{ id: "repo_#{repo.owner}___#{repo.slug}" }
%td
- = link_to repo.full_name, "https://bitbucket.org/#{repo.full_name}", target: '_blank', rel: 'noopener noreferrer'
+ = link_to repo.full_name, repo.browse_url, target: '_blank', rel: 'noopener noreferrer'
%td.import-target
%td.import-actions-job-status
= label_tag 'Incompatible Project', nil, class: 'label badge-danger'
- if @incompatible_repos.any?
%p
- One or more of your Bitbucket projects cannot be imported into GitLab
+ One or more of your Bitbucket Server projects cannot be imported into GitLab
directly because they use Subversion or Mercurial for version control,
rather than Git. Please convert
= link_to 'them to Git,', 'https://www.atlassian.com/git/tutorials/migrating-overview'