diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2016-12-28 11:36:28 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2016-12-28 11:36:28 +0000 |
| commit | 465700ddc2fa43bf32bc2ed08d9c30e420aec5e2 (patch) | |
| tree | 66a39239e05ec326273ba42add41e72956b8e9fd /lib | |
| parent | 8aba0b0ed0ba93c59296f707f8c9a7d8ab1b498f (diff) | |
| parent | 1b109c99a4802e2cc6598d19248013c0dc152d7a (diff) | |
| download | gitlab-ce-465700ddc2fa43bf32bc2ed08d9c30e420aec5e2.tar.gz | |
Merge branch 'fix-api-deprecation' into 'master'
Fix a Grape deprecation, use `#request_method` instead of `#route_method`
See merge request !8297
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/helpers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index fe00c83bff3..ee9247ee240 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -96,7 +96,7 @@ module API end def authenticate_non_get! - authenticate! unless %w[GET HEAD].include?(route.route_method) + authenticate! unless %w[GET HEAD].include?(route.request_method) end def authenticate_by_gitlab_shell_token! |