diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:33:52 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-06 16:33:52 +0200 |
| commit | d9b292f8726e46050e2d882a9a9fc1be95007d18 (patch) | |
| tree | 6f254d2829d113b41d18a12b43be5a10a96847e3 /app/controllers/projects/builds_controller.rb | |
| parent | 7ad7e10feed624e263b5b80f5cafd4b0ed900ad7 (diff) | |
| parent | aa7cef9325f1f4b9db91c28f41fad3d4bc7252f0 (diff) | |
| download | gitlab-ce-d9b292f8726e46050e2d882a9a9fc1be95007d18.tar.gz | |
Merge remote-tracking branch 'origin/master' into rename-ci-commit
# Conflicts:
# spec/features/builds_spec.rb
Diffstat (limited to 'app/controllers/projects/builds_controller.rb')
| -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 de8abf86394..9b80efa5f11 100644 --- a/app/controllers/projects/builds_controller.rb +++ b/app/controllers/projects/builds_controller.rb @@ -81,7 +81,7 @@ class Projects::BuildsController < Projects::ApplicationController private def build - @build ||= project.builds.unscoped.find_by!(id: params[:id]) + @build ||= project.builds.find_by!(id: params[:id]) end def build_path(build) |