summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2015-04-18 19:39:43 -0700
committerBen Bodenmiller <bbodenmiller@hotmail.com>2015-04-20 03:13:39 -0700
commit47769bfd599c46c6052ed69f7fce4836470008da (patch)
tree4039f224a7dba8299e64433c6ddfc545342406bd
parent41f01dd3f4c13502483f59b754af8429abc6af39 (diff)
downloadgitlab-ce-47769bfd599c46c6052ed69f7fce4836470008da.tar.gz
improve new project options
* Simplify new repo commands * Include directions for how to add an existing folder that is either already a repo or not yet a repo Replaces #7918.
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/projects/empty.html.haml11
2 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0f250a0c365..e248a0cf41b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 7.11.0 (unreleased)
-
-
-
+ - Improve new project command options (Ben Bodenmiller)
v 7.10.0 (unreleased)
- Ignore submodules that are defined in .gitmodules but are checked in as directories.
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 49806ceaa96..4f8104e0792 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -27,20 +27,19 @@
%legend Create a new repository
%pre.dark
:preserve
- mkdir #{@project.path}
+ git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')}
cd #{@project.path}
- git init
touch README.md
git add README.md
- git commit -m "first commit"
- git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
+ git commit -m "add README"
git push -u origin master
%fieldset
- %legend Push an existing Git repository
+ %legend Existing folder or Git repository
%pre.dark
:preserve
- cd existing_git_repo
+ cd existing_folder
+ git init
git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
git push -u origin master