diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-15 07:14:57 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-15 07:14:57 +0000 |
| commit | ee39cbfc0e1bf75cd014cbff9420f081355dc3f8 (patch) | |
| tree | 093800486af5bc8cafa948483a6cac47eac6acb7 | |
| parent | 3125c14e805a22d1396edc65762f3820a86a953c (diff) | |
| parent | 63670bb7f84d1c728c32a1914ed378de4e4ac0de (diff) | |
| download | gitlab-ce-ee39cbfc0e1bf75cd014cbff9420f081355dc3f8.tar.gz | |
Merge branch 'patch-1' into 'master'
existing folders and existing repos should not use the same set of instructions …
See merge request !3446
| -rw-r--r-- | app/views/projects/empty.html.haml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 3525a07a687..f5769a629a0 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -52,7 +52,7 @@ git push -u origin master %fieldset - %h5 Existing folder or Git repository + %h5 Existing folder %pre.light-well :preserve cd existing_folder @@ -62,6 +62,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" |