diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 14:27:42 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-10-05 14:27:42 +0200 |
| commit | aba71835f310d5aad9c2af9e22c81bd44e6f0686 (patch) | |
| tree | 40abb714359b8bed16bc5f43b7c4a085eb12d473 /app/controllers/projects | |
| parent | b229637b0837065a9993d06573b41218ab7e9dfb (diff) | |
| parent | 1fe7a42afca83fbbda638d9569d58a87039cd8f2 (diff) | |
| download | gitlab-ce-aba71835f310d5aad9c2af9e22c81bd44e6f0686.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index 7d0e2b3e2ef..95d7a02e9e9 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -9,6 +9,7 @@ class Projects::GitHttpClientController < Projects::ApplicationController delegate :actor, :authentication_abilities, to: :authentication_result, allow_nil: true alias_method :user, :actor + alias_method :authenticated_user, :actor # Git clients will not know what authenticity token to send along skip_before_action :verify_authenticity_token |