diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:39:36 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-26 09:39:36 +0000 |
| commit | fca610e5cbf5382f3814120227a0ca11440c8a9f (patch) | |
| tree | b0bbe067f8aeec5309a42080319af59e60c15540 /lib | |
| parent | adf50202d773cad57f57b6fd8bb0454216fbe877 (diff) | |
| parent | 71507745306cfb1ec9734e010ee1d24373aea77e (diff) | |
| download | gitlab-ce-fca610e5cbf5382f3814120227a0ca11440c8a9f.tar.gz | |
Merge branch 'api-alphabetical' into 'master'
Keep API mounts in alphabetical order
## What does this MR do?
Just a cosmetic change to keep the API mounts in order.
See merge request !6515
Diffstat (limited to 'lib')
| -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 |