summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-09-15 06:45:03 -0700
committerStan Hu <stanhu@gmail.com>2015-09-15 06:45:03 -0700
commit2abe7338665a87581ac99db93c3c60e5fc95ac1a (patch)
tree5261f3e6dcf51b7ea15e8e72f6d9afa7ab049c6e
parent4d2b67acc0bbd3337e8d96ac9878a3dc08e23ac0 (diff)
downloadgitlab-ce-2abe7338665a87581ac99db93c3c60e5fc95ac1a.tar.gz
Display "Forking in Progress" when importing a forked project
-rw-r--r--app/views/projects/imports/show.html.haml7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/projects/imports/show.html.haml b/app/views/projects/imports/show.html.haml
index 91ecd82c04b..06886d215a3 100644
--- a/app/views/projects/imports/show.html.haml
+++ b/app/views/projects/imports/show.html.haml
@@ -3,8 +3,11 @@
.center
%h2
%i.fa.fa-spinner.fa-spin
- Import in progress.
- - if @project.import_url.present?
+ - 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