diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-02 16:24:37 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-02 16:24:37 -0700 |
| commit | 0a074f2e091d8b2f1bce49e50ecf69b667c62dc2 (patch) | |
| tree | 314027556f06514278a4f83f35813c00b2d5418f /lib/api/helpers.rb | |
| parent | 588219352c99213d099aff72f32d6ad9ec4830d4 (diff) | |
| parent | de25604fbca2f7005754d821d571bbcb1cc510ac (diff) | |
| download | gitlab-ce-0a074f2e091d8b2f1bce49e50ecf69b667c62dc2.tar.gz | |
fix pipelines/index.html.haml merge conflict
Diffstat (limited to 'lib/api/helpers.rb')
| -rw-r--r-- | lib/api/helpers.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 106694e13df..20b5bc1502a 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -91,7 +91,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! @@ -243,7 +243,7 @@ module API rack_response({ 'message' => '500 Internal Server Error' }.to_json, 500) end - # Projects helpers + # project helpers def filter_projects(projects) if params[:search].present? |