diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-01-27 11:30:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-01-27 11:30:57 +0000 |
| commit | b9ff4656a8afc7f401d032b857c2089612c597c2 (patch) | |
| tree | a05c44708a7b0ef10a896300918a461cb34a8b4d /app/controllers | |
| parent | d64dfd7b236f0af79ffd4b485cc92977b8d0fa58 (diff) | |
| parent | 68e94450a06e043ecf58ede565060f41b61043f9 (diff) | |
| download | gitlab-ce-b9ff4656a8afc7f401d032b857c2089612c597c2.tar.gz | |
Merge branch '26943-fix-user-in-build-presenter' into 'master'
Don't override Ci::Build#user when presenting a build
Closes #26943
See merge request !8668
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/builds_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb index 9b45ed6b6af..886934a3f67 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -94,7 +94,7 @@ class Projects::BuildsController < Projects::ApplicationController private def build - @build ||= project.builds.find_by!(id: params[:id]).present(user: current_user) + @build ||= project.builds.find_by!(id: params[:id]).present(current_user: current_user) end def build_path(build) |