From 8e53bae700e356a42f86457295b6b25fc0b03d6d Mon Sep 17 00:00:00 2001 From: karen Carias Date: Sun, 2 Aug 2015 09:52:30 -0700 Subject: New doc about how to add an image in GitLab Basics --- doc/gitlab-basics/README.md | 2 ++ doc/gitlab-basics/add-image.md | 62 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 doc/gitlab-basics/add-image.md (limited to 'doc') diff --git a/doc/gitlab-basics/README.md b/doc/gitlab-basics/README.md index 9491f8c91fe..b904c70e980 100644 --- a/doc/gitlab-basics/README.md +++ b/doc/gitlab-basics/README.md @@ -20,4 +20,6 @@ Step-by-step guides on the basics of working with Git and GitLab. * [Add a file](add-file.md) +* [Add an image](add-image.md) + * [Create a Merge Request](add-merge-request.md) diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md new file mode 100644 index 00000000000..4a43e8c3584 --- /dev/null +++ b/doc/gitlab-basics/add-image.md @@ -0,0 +1,62 @@ +# How to add an image + +The following are the steps to add images to your repository in +GitLab: + +Find the image that you’d like to add. + +In your computer files, find the GitLab project to which you'd like to add the image +(you'll find it as a regular file). Click on every file until you find exactly where you'd +like to add the image. There, paste the image. + +Go to your [shell](command-line-commands.md), and add the following commands: + +- To find the correct file, add this command for every file that you'd like to open until +you reach the file where you added your image: +``` +cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN +``` + +- Create a new branch: +``` +git checkout -b NAME-OF-BRANCH +``` + +- Check if your image was correctly added to the file: +``` +ls +``` + +You should see the name of the image in the list shown. + +- Go back one file: +``` +cd ../ +``` + +- Check the status and you should see your image’s name in red: +``` +git status +``` + +- Add your changes: +``` +git add NAME-OF-YOUR-IMAGE +``` + +- Check the status and you should see your image’s name in green: +``` +git status +``` + +- Add the commit: +``` +git commit -m “DESCRIBE COMMIT IN A FEW WORDS” +``` + +- Send your changes to GitLab.com: +``` +git push origin NAME-OF-BRANCH +``` + +Your image should've been added to your repository in GitLab. -- cgit v1.2.3 From 4f9d32eab01a51b9de6ff49b74e4599bdcccbc99 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Sun, 2 Aug 2015 09:54:42 -0700 Subject: typo --- doc/gitlab-basics/add-image.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 4a43e8c3584..f3ef569f724 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -11,50 +11,50 @@ like to add the image. There, paste the image. Go to your [shell](command-line-commands.md), and add the following commands: -- To find the correct file, add this command for every file that you'd like to open until +To find the correct file, add this command for every file that you'd like to open until you reach the file where you added your image: ``` cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN ``` -- Create a new branch: +Create a new branch: ``` git checkout -b NAME-OF-BRANCH ``` -- Check if your image was correctly added to the file: +Check if your image was correctly added to the file: ``` ls ``` You should see the name of the image in the list shown. -- Go back one file: +Go back one file: ``` cd ../ ``` -- Check the status and you should see your image’s name in red: +Check the status and you should see your image’s name in red: ``` git status ``` -- Add your changes: +Add your changes: ``` git add NAME-OF-YOUR-IMAGE ``` -- Check the status and you should see your image’s name in green: +Check the status and you should see your image’s name in green: ``` git status ``` -- Add the commit: +Add the commit: ``` git commit -m “DESCRIBE COMMIT IN A FEW WORDS” ``` -- Send your changes to GitLab.com: +Send your changes to GitLab.com: ``` git push origin NAME-OF-BRANCH ``` -- cgit v1.2.3 From 88ae5a9b207122d3a90cc13bab9c41af3b87f14d Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 3 Aug 2015 15:36:26 -0700 Subject: fixed terminology --- doc/gitlab-basics/add-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index f3ef569f724..461cd9f6170 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -54,7 +54,7 @@ Add the commit: git commit -m “DESCRIBE COMMIT IN A FEW WORDS” ``` -Send your changes to GitLab.com: +Now you can push (send) your changes (in the branch NAME-OF-BRANCH) to GitLab (the git remote named 'origin'): ``` git push origin NAME-OF-BRANCH ``` -- cgit v1.2.3 From bac34a38f624527549a2a411d547f26f3fcc2cc5 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Thu, 6 Aug 2015 22:40:38 -0700 Subject: fixed one line --- doc/gitlab-basics/add-image.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 461cd9f6170..28b6f3a925c 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -59,4 +59,5 @@ Now you can push (send) your changes (in the branch NAME-OF-BRANCH) to GitLab (t git push origin NAME-OF-BRANCH ``` -Your image should've been added to your repository in GitLab. +Your image will be added to your branch in your repository in GitLab. Create a [Merge Request](add-merge-request.md) +to integrate your changes to your project. -- cgit v1.2.3 From 95aa13f0b7efc096012db6634c169a4c83b059f6 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Mon, 10 Aug 2015 17:17:30 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index 28b6f3a925c..e574c0ec7e9 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -11,8 +11,7 @@ like to add the image. There, paste the image. Go to your [shell](command-line-commands.md), and add the following commands: -To find the correct file, add this command for every file that you'd like to open until -you reach the file where you added your image: +Add this command for every directory that you'd like to open: ``` cd NAME-OF-FILE-YOU'D-LIKE-TO-OPEN ``` -- cgit v1.2.3 From 1df163866ffbb5c1e748741dd88e3e7d0330a36b Mon Sep 17 00:00:00 2001 From: karen Carias Date: Tue, 11 Aug 2015 19:16:13 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index e574c0ec7e9..fab60c552a5 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -21,14 +21,14 @@ Create a new branch: git checkout -b NAME-OF-BRANCH ``` -Check if your image was correctly added to the file: +Check if your image was correctly added to the directory: ``` ls ``` You should see the name of the image in the list shown. -Go back one file: +Go back one directory: ``` cd ../ ``` -- cgit v1.2.3 From 235acd2226aa938fd4d992ca5daf44565b8316a4 Mon Sep 17 00:00:00 2001 From: karen Carias Date: Tue, 11 Aug 2015 19:18:20 -0700 Subject: fixed text --- doc/gitlab-basics/add-image.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/gitlab-basics/add-image.md b/doc/gitlab-basics/add-image.md index fab60c552a5..476b48a217c 100644 --- a/doc/gitlab-basics/add-image.md +++ b/doc/gitlab-basics/add-image.md @@ -28,7 +28,7 @@ ls You should see the name of the image in the list shown. -Go back one directory: +Move up the hierarchy through directories: ``` cd ../ ``` -- cgit v1.2.3 From 95f8f7c729a3a14ca6408ac050eb7bef6bb6fec4 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Wed, 12 Aug 2015 15:39:58 -0400 Subject: api: add 'system', 'upvote', and 'downvote' fields to note queries This reverts commit 4c586dc7c217b3e43956919fa752a8fa4e16acb9. --- doc/api/notes.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/api/notes.md b/doc/api/notes.md index ee2f9fa0eac..c683cb883d4 100644 --- a/doc/api/notes.md +++ b/doc/api/notes.md @@ -31,7 +31,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:22:45Z" + "created_at": "2013-10-02T09:22:45Z", + "system": true, + "upvote": false, + "downvote": false }, { "id": 305, @@ -45,7 +48,10 @@ Parameters: "state": "active", "created_at": "2013-09-30T13:46:01Z" }, - "created_at": "2013-10-02T09:56:03Z" + "created_at": "2013-10-02T09:56:03Z", + "system": false, + "upvote": false, + "downvote": false } ] ``` -- cgit v1.2.3