diff options
| author | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-22 21:43:17 +0200 |
|---|---|---|
| committer | Jan-Gerd Tenberge <janten@gmail.com> | 2015-10-22 21:43:17 +0200 |
| commit | b5c19bcc4d02fd498bc95d70c39bd88ec9cdda4b (patch) | |
| tree | 6eaed47ca3b65dbd622813497b18902666d23d68 /lib/api/api.rb | |
| parent | b32bb377993fb0224ed3bd9294d752d1a82b2ef9 (diff) | |
| parent | a7174efaec77e9408900336b5941d9cca1f82ccf (diff) | |
| download | gitlab-ce-b5c19bcc4d02fd498bc95d70c39bd88ec9cdda4b.tar.gz | |
Fix merge error
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 c09488d3547..afc0402f9e1 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -46,6 +46,7 @@ module API mount Services mount Files mount Commits + mount CommitStatus mount Namespaces mount Branches mount Labels |