summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-30 13:52:24 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-09-30 13:52:24 +0000
commit9d48bace9b42eb8eac7d3d27a678da54364555a2 (patch)
tree20935e96679af8eef3bc51feaf833b4b966341f3
parente7e78289dd1de9742104ef8f657f382d473e094b (diff)
parent6f1d243b998bfba6beedd0f7f6ff6ddb976a18c8 (diff)
downloadgitlab-ce-9d48bace9b42eb8eac7d3d27a678da54364555a2.tar.gz
Merge branch 'patch-6' into 'master'
Fixed Session Cookie header ## What does this MR do? This MR fixes the wiki text header for the Session Cookie section ## Are there points in the code the reviewer needs to double check? It is markdown so probably not. Two very simple changes - first is replacing a dot with a space (was causing invalid markdown, not rendered as a header) and capitalized the word Cookie to match the other header formatting. ## Why was this MR needed? Fix the wiki documentation. ## Screenshots (if relevant) None. ## Does this MR meet the acceptance criteria? I can't imagine it wouldn't. - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? I didn't think this warranted an issue as it is just some simple wiki markdown formatting with little to no consequence. See merge request !6584
-rw-r--r--doc/api/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/README.md b/doc/api/README.md
index 8e4f7f12b4b..bbd5bcfb386 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -101,7 +101,7 @@ Once you have your token, pass it to the API using either the `private_token`
parameter or the `PRIVATE-TOKEN` header.
-### Session cookie
+### Session Cookie
When signing in to GitLab as an ordinary user, a `_gitlab_session` cookie is
set. The API will use this cookie for authentication if it is present, but using