diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-15 16:04:20 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-15 16:04:20 +0000 |
| commit | dad9de660cc6509fab1fe3db0432f0aa858c9d38 (patch) | |
| tree | 9ddb017e95b3459fe230114cb595a6c05a1ff64c | |
| parent | 0ecc57fe50562bf2afede2e89d0bab69de89aebd (diff) | |
| parent | 2abe7338665a87581ac99db93c3c60e5fc95ac1a (diff) | |
| download | gitlab-ce-dad9de660cc6509fab1fe3db0432f0aa858c9d38.tar.gz | |
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:
After:
See merge request !1295
| -rw-r--r-- | app/views/projects/imports/show.html.haml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml index 39fe0fc1c4f..06886d215a3 100644 --- a/app/views/projects/imports/show.html.haml +++ b/app/views/projects/imports/show.html.haml @@ -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(); |