diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-24 11:31:59 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-11-24 11:31:59 +0000 |
| commit | 79a791a30d60d04be34d0e6d36c9cc145b97635b (patch) | |
| tree | 7495834ed7bdfb51946c5f40fc61f1568ff0f823 /lib/api/api.rb | |
| parent | fa04393482eff8d7d7cdb71c3bdea2c918a49a57 (diff) | |
| parent | 3e44ed3e2bf75bb14a2d8b0466b3d92afd0ea067 (diff) | |
| download | gitlab-ce-menu-resize-hide.tar.gz | |
Merge branch 'master' into menu-resize-hidemenu-resize-hide
Diffstat (limited to 'lib/api/api.rb')
| -rw-r--r-- | lib/api/api.rb | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/api/api.rb b/lib/api/api.rb index 74ca4728695..67109ceeef9 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -28,13 +28,15 @@ module API helpers ::SentryHelper helpers ::API::Helpers + # Keep in alphabetical order mount ::API::AccessRequests mount ::API::AwardEmoji + mount ::API::Boards mount ::API::Branches mount ::API::BroadcastMessages mount ::API::Builds - mount ::API::CommitStatuses mount ::API::Commits + mount ::API::CommitStatuses mount ::API::DeployKeys mount ::API::Deployments mount ::API::Environments @@ -44,9 +46,9 @@ module API mount ::API::Issues mount ::API::Keys mount ::API::Labels - mount ::API::LicenseTemplates mount ::API::Lint mount ::API::Members + mount ::API::MergeRequestDiffs mount ::API::MergeRequests mount ::API::Milestones mount ::API::Namespaces @@ -54,8 +56,8 @@ module API mount ::API::NotificationSettings mount ::API::Pipelines mount ::API::ProjectHooks - mount ::API::ProjectSnippets mount ::API::Projects + mount ::API::ProjectSnippets mount ::API::Repositories mount ::API::Runners mount ::API::Services @@ -70,6 +72,10 @@ module API mount ::API::Triggers mount ::API::Users mount ::API::Variables - mount ::API::MergeRequestDiffs + mount ::API::Version + + route :any, '*path' do + error!('404 Not Found', 404) + end end end |