summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkeen99 <keen@icantclick.org>2016-03-29 21:51:31 +0000
committerkeen99 <keen@icantclick.org>2016-03-29 21:51:31 +0000
commit63670bb7f84d1c728c32a1914ed378de4e4ac0de (patch)
treea739656d539805b9a5ca988a3af0abb9a83a165c
parentf7d20a6f76de33624f069185d28649e6e9b411f7 (diff)
downloadgitlab-ce-63670bb7f84d1c728c32a1914ed378de4e4ac0de.tar.gz
existing folders and existing repos should not use the same set of instructions - pushing an existing repo into gitlab using the previous instructions would result in loss (at the gitlab remote end) of exist branches and tags. so lets push those!
-rw-r--r--app/views/projects/empty.html.haml11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 6ad7b05155a..05e73326ee4 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -44,7 +44,7 @@
git push -u origin master
%fieldset
- %h5 Existing folder or Git repository
+ %h5 Existing folder
%pre.light-well
:preserve
cd existing_folder
@@ -54,6 +54,15 @@
git commit
git push -u origin master
+ %fieldset
+ %h5 Existing Git repository
+ %pre.light-well
+ :preserve
+ cd existing_repo
+ git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+ git push -u origin --all
+ git push -u origin --tags
+
- if can? current_user, :remove_project, @project
.prepend-top-20
= link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"