diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-02 14:28:17 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-02 14:28:17 +0300 |
commit | 7c89308ae4891085d59c6f85da77c5c13e0bd233 (patch) | |
tree | 3c866aac276059962c2111a3e07072f914518a98 /doc | |
parent | 30b56b160b854baf03bfacd80c0e87d62716dd0f (diff) |
Move docs for template dropdowns to the new location
Diffstat (limited to 'doc')
-rw-r--r-- | doc/gitlab-basics/add-file.md | 14 | ||||
-rw-r--r-- | doc/gitlab-basics/basicsimages/mit_license.png | bin | 101405 -> 0 bytes | |||
-rw-r--r-- | doc/user/project/repository/img/web_editor_template_dropdown_buttons.png (renamed from doc/gitlab-basics/basicsimages/file_button.png) | bin | 14131 -> 14131 bytes | |||
-rw-r--r-- | doc/user/project/repository/img/web_editor_template_dropdown_first_file.png (renamed from doc/gitlab-basics/basicsimages/first_file.png) | bin | 25748 -> 25748 bytes | |||
-rw-r--r-- | doc/user/project/repository/img/web_editor_template_dropdown_mit_license.png | bin | 0 -> 85413 bytes | |||
-rw-r--r-- | doc/user/project/repository/web_editor.md | 24 |
6 files changed, 24 insertions, 14 deletions
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md index 27591a4a15a..ff10a98e8f5 100644 --- a/doc/gitlab-basics/add-file.md +++ b/doc/gitlab-basics/add-file.md @@ -25,17 +25,3 @@ Add all the information that you'd like to include in your file: Add a commit message based on what you just added and then click on "commit changes": ![Commit changes](basicsimages/commit_changes.png) - -# On a new project - -When starting a new project, there are some common files which the new project might need too. Therefore a message will be displayed by GitLab to make this easy for you. - -![First file for your project](basicsimages/first_file.png) - -When clicking on either `LICENSE` or `.gitignore`, a dropdown will be displayed to provide you with a template which might be suitable for your project. - -![MIT license selected](basicsimages/mit_license.png) - -The license, changelog, contribution guide, or `.gitlab-ci.yml` file could also be added through a button on the project page. In the example below the license has already been created, which creates a link to the license itself. - -![New file button](basicsimages/file_button.png) diff --git a/doc/gitlab-basics/basicsimages/mit_license.png b/doc/gitlab-basics/basicsimages/mit_license.png Binary files differdeleted file mode 100644 index 3695a11e34c..00000000000 --- a/doc/gitlab-basics/basicsimages/mit_license.png +++ /dev/null diff --git a/doc/gitlab-basics/basicsimages/file_button.png b/doc/user/project/repository/img/web_editor_template_dropdown_buttons.png Binary files differindex 4efc51cc423..4efc51cc423 100644 --- a/doc/gitlab-basics/basicsimages/file_button.png +++ b/doc/user/project/repository/img/web_editor_template_dropdown_buttons.png diff --git a/doc/gitlab-basics/basicsimages/first_file.png b/doc/user/project/repository/img/web_editor_template_dropdown_first_file.png Binary files differindex 67190c58823..67190c58823 100644 --- a/doc/gitlab-basics/basicsimages/first_file.png +++ b/doc/user/project/repository/img/web_editor_template_dropdown_first_file.png diff --git a/doc/user/project/repository/img/web_editor_template_dropdown_mit_license.png b/doc/user/project/repository/img/web_editor_template_dropdown_mit_license.png Binary files differnew file mode 100644 index 00000000000..47719113805 --- /dev/null +++ b/doc/user/project/repository/img/web_editor_template_dropdown_mit_license.png diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index ee8e7862572..7c041d019bb 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -25,6 +25,29 @@ When you are satisfied with your new file, click **Commit Changes** at the botto ![Create file editor](img/web_editor_new_file_editor.png) +### Template dropdowns + +When starting a new project, there are some common files which the new project +might need too. Therefore a message will be displayed by GitLab to make this +easy for you. + +![First file for your project](img/web_editor_template_dropdown_first_file.png) + +When clicking on either `LICENSE` or `.gitignore`, a dropdown will be displayed +to provide you with a template which might be suitable for your project. + +![MIT license selected](img/web_editor_template_dropdown_mit_license.png) + +The license, changelog, contribution guide, or `.gitlab-ci.yml` file could also +be added through a button on the project page. In the example below the license +has already been created, which creates a link to the license itself. + +![New file button](img/web_editor_template_dropdown_buttons.png) + +>**Note:** +The **Set up CI** button will not appear on an empty repository. You have to at +least add a file in order for the button to show up. + ## Upload a file The ability to create a file is great when the content is text. However, this @@ -147,5 +170,6 @@ you commit the changes you will be taken to a new merge request form. ![Start a new merge request with these changes](img/web_editor_start_new_merge_request.png) +![New file button](basicsimages/file_button.png) [ce-2808]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2808 [issue closing pattern]: ../customization/issue_closing.md |