Merge branch 'master' into remove-satellites

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 72 insertions, 2 deletions

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
   }
 ]
 ```
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..476b48a217c
--- /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:
+
+Add this command for every directory that you'd like to open:
+```
+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 directory:
+```
+ls
+```
+
+You should see the name of the image in the list shown.
+
+Move up the hierarchy through directories:
+```
+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”
+```
+
+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
+```
+
+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.