summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 09:46:38 -0500
committerKamil Trzcinski <ayufan@ayufan.eu>2016-05-14 09:46:38 -0500
commita6b8d36ae933c3f21e7ba2c17864c6d8bf626d25 (patch)
tree2fbc015f7a374eb329543920305fbe9478bcfa66
parentecee057795ff22c335cb999bb677fbc623e879df (diff)
downloadgitlab-ce-a6b8d36ae933c3f21e7ba2c17864c6d8bf626d25.tar.gz
Fix specs
-rw-r--r--app/controllers/projects/pipelines_controller.rb3
-rw-r--r--app/models/commit_status.rb2
2 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index bdb5722c55f..f3f5338003a 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -31,9 +31,6 @@ class Projects::PipelinesController < Projects::ApplicationController
end
def show
- respond_to do |format|
- format.html
- end
end
def retry
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 521456bedee..213cd20e8d8 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -55,7 +55,7 @@ class CommitStatus < ActiveRecord::Base
def self.stages
# We group by stage name, but order stages by theirs' index
- unscoped.where(id: all).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
+ unscoped.where(id: all.ids).group('stage').order('max(stage_idx)', 'stage').pluck('stage')
end
def self.status_for_stage(stage)