diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-02-06 19:08:06 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-02-06 19:08:06 +0300 |
| commit | 5db5a9cbd1192d776874a92e0a253c605f3c4417 (patch) | |
| tree | 67be95609ce038ec9c2fbdc45fb491bb223c7137 /lib/api/api.rb | |
| parent | a29f0c28fd07ba14f0d0e5fb9c878a2eb117e388 (diff) | |
| parent | ba62493009c2360018709b660956a6173f3e1515 (diff) | |
Merge branch 'master' into 'zj-wiki-page-versions'
# Conflicts:
# Gemfile
# Gemfile.lock
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 ae161efb358..f3f64244589 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -106,6 +106,7 @@ module API # Keep in alphabetical order mount ::API::AccessRequests + mount ::API::Applications mount ::API::AwardEmoji mount ::API::Boards mount ::API::Branches |