diff options
| author | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
|---|---|---|
| committer | Sean Packham <seanpackham@gitlab.com> | 2016-09-27 15:42:35 +0100 |
| commit | 1aad8f2f0f68f7ba1811a3fff48b181af85f752d (patch) | |
| tree | a8d45620ef22fa4a553de813254add25a998ee8c /lib/api/api.rb | |
| parent | 0ef54d504c90146ffdbff5c699a40c689127b369 (diff) | |
| parent | 7b42ff6306bccc63a70f6731ce92974ec0a5e12b (diff) | |
| download | gitlab-ce-1aad8f2f0f68f7ba1811a3fff48b181af85f752d.tar.gz | |
Merge branch 'master' into add-university-content
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 74ca4728695..cb47ec8f33f 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -28,6 +28,7 @@ module API helpers ::SentryHelper helpers ::API::Helpers + # Keep in alphabetical order mount ::API::AccessRequests mount ::API::AwardEmoji mount ::API::Branches @@ -48,6 +49,7 @@ module API mount ::API::Lint mount ::API::Members mount ::API::MergeRequests + mount ::API::MergeRequestDiffs mount ::API::Milestones mount ::API::Namespaces mount ::API::Notes @@ -70,6 +72,5 @@ module API mount ::API::Triggers mount ::API::Users mount ::API::Variables - mount ::API::MergeRequestDiffs end end |