Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 17:33:52 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-06-06 17:33:52 +0300
commitd9b292f8726e46050e2d882a9a9fc1be95007d18 (patch)
tree6f254d2829d113b41d18a12b43be5a10a96847e3 /app/controllers/projects/builds_controller.rb
parent7ad7e10feed624e263b5b80f5cafd4b0ed900ad7 (diff)
parentaa7cef9325f1f4b9db91c28f41fad3d4bc7252f0 (diff)
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.rb2
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)