diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 10:56:41 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-21 10:56:41 +0000 |
commit | 0d287b06a6fa7a373df03378f9f1a048e5890a4f (patch) | |
tree | 271a95f91752727a3ee350e4f47f82e9f6355357 /lib/api/api.rb | |
parent | f90c8c624d2bf0391a25ae07b1516d11948e1a81 (diff) | |
parent | 35383f33acaae6b286c203005b0410388a3bcca0 (diff) | |
download | gitlab-ce-0d287b06a6fa7a373df03378f9f1a048e5890a4f.tar.gz |
Merge branch '17521-gitlab-ci-yml-templates' into 'master'
GitLab CI Yaml template dropdown
## What does this MR do?
Make it possible to select a dropdown for an easy start with GitLab CI.
## What are the relevant issue numbers?
Closes #17521
## TODO
- [ ] Backend
- [x] CHANGELOG item
- [x] Fix rubocop failure
- [x] API Support
- [x] New tests
- [x] Add disclaimer to the top of the gitlab-ci.yml
- [ ] Frontend
- [x] New tests
See merge request !4411
Diffstat (limited to 'lib/api/api.rb')
-rw-r--r-- | lib/api/api.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 0e7a1cc2623..f8f680a6311 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -33,7 +33,6 @@ module API mount ::API::Commits mount ::API::DeployKeys mount ::API::Files - mount ::API::Gitignores mount ::API::GroupMembers mount ::API::Groups mount ::API::Internal @@ -58,6 +57,7 @@ module API mount ::API::Subscriptions mount ::API::SystemHooks mount ::API::Tags + mount ::API::Templates mount ::API::Triggers mount ::API::Users mount ::API::Variables |