Commit dad9de66 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'import-in-progress-fix' into 'master'

Don't display "git clone --bare <URL>" if no URL is available

Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png)

See merge request !1295
parents 0ecc57fe 2abe7338
......@@ -3,8 +3,12 @@
.center
%h2
%i.fa.fa-spinner.fa-spin
Import in progress.
%p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
- if @project.forked?
Forking in progress.
- else
Import in progress.
- unless @project.forked?
%p.monospace git clone --bare #{hidden_pass_url(@project.import_url)}
%p Please wait while we import the repository for you. Refresh at will.
:javascript
new ProjectImport();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment