diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 07:25:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-01 07:25:48 +0000 |
| commit | 3cc138d824df039af2d7dae2ae04c30e98b51af1 (patch) | |
| tree | e7b16ba807cad3231b69457bcc71ccbb1b74c4ce /lib/api/api.rb | |
| parent | 17c926313a242c6ad988a7ffd55aa6330c8aacfd (diff) | |
| parent | dd0f8b8ccc3b5f61e31703f7391a919b702934a5 (diff) | |
| download | gitlab-ce-3cc138d824df039af2d7dae2ae04c30e98b51af1.tar.gz | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index bbdd2039f43..7ae2f3cad40 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -94,6 +94,7 @@ module API mount ::API::DeployKeys mount ::API::Deployments mount ::API::Environments + mount ::API::Features mount ::API::Files mount ::API::Groups mount ::API::Internal |