diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-12-29 09:30:55 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-12-29 09:30:55 +0100 |
| commit | 42fb42aed4cc30d101e81fa5934d9f1b9521dfce (patch) | |
| tree | 2efa529fe83f7d06d815bd153ae1ea9f8e1f4b7a /lib/api/api.rb | |
| parent | 1c089a8561556377dccbf661a3016cac2329c713 (diff) | |
| parent | 6cf501004b54c1b311ea7c6c364cfb4a88c1060b (diff) | |
| download | gitlab-ce-42fb42aed4cc30d101e81fa5934d9f1b9521dfce.tar.gz | |
Merge branch 'master' into developer_can_push_to_protected_branches_option
Conflicts:
db/schema.rb
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 d26667ba3f7..cb46f477ff9 100644 --- a/lib/api/api.rb +++ b/lib/api/api.rb @@ -2,6 +2,7 @@ Dir["#{Rails.root}/lib/api/*.rb"].each {|file| require file} module API class API < Grape::API + include APIGuard version 'v3', using: :path rescue_from ActiveRecord::RecordNotFound do |