summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-06-06 10:23:29 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-06-06 10:23:29 +0000
commit5f77689e7837cccb0fd28748942f787aef1c3964 (patch)
tree3705dedee595aefe0abdea28178e9523c51e2c39
parent4a811fbc11db2d1ab7459f7264848a3b06ff2299 (diff)
parenta17bfd368f8ca158b0155862d6fb72cf252977dd (diff)
downloadgitlab-ce-5f77689e7837cccb0fd28748942f787aef1c3964.tar.gz
Merge branch '30156-api-environment-info-missed' into 'master'
Resolve "API: Environment info missed" Closes #30156 See merge request !11900
-rw-r--r--doc/api/README.md1
-rw-r--r--doc/api/environments.md (renamed from doc/api/enviroments.md)0
2 files changed, 1 insertions, 0 deletions
diff --git a/doc/api/README.md b/doc/api/README.md
index 45579ccac4e..44e345b1cf6 100644
--- a/doc/api/README.md
+++ b/doc/api/README.md
@@ -15,6 +15,7 @@ following locations:
- [Commits](commits.md)
- [Deployments](deployments.md)
- [Deploy Keys](deploy_keys.md)
+- [Environments](environments.md)
- [Gitignores templates](templates/gitignores.md)
- [GitLab CI Config templates](templates/gitlab_ci_ymls.md)
- [Groups](groups.md)
diff --git a/doc/api/enviroments.md b/doc/api/environments.md
index 5ca766bf87d..5ca766bf87d 100644
--- a/doc/api/enviroments.md
+++ b/doc/api/environments.md