Merge remote-tracking branch 'ce/8-12-stable' into 8-12-stable-ee

9f1d7f14 · Ruben Davila · 696d7182 · 83b02e3c · 9f1d7f14
Commit 9f1d7f14 authored Sep 20, 2016 by Ruben Davila
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/controllers/projects/git_http_client_controller.rb app/controllers/projects/git_http_client_controller.rb +0 -4

No files found.
--- a/app/controllers/projects/git_http_client_controller.rb
+++ b/app/controllers/projects/git_http_client_controller.rb
@@ -153,8 +153,4 @@ class Projects::GitHttpClientController < Projects::ApplicationController
  def verify_workhorse_api!
    Gitlab::Workhorse.verify_api_request!(request.headers)
  end
-
-  def verify_workhorse_api!
-    Gitlab::Workhorse.verify_api_request!(request.headers)
-  end
 end