Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
a6b8d36a
Commit
a6b8d36a
authored
May 14, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
ecee0577
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
4 deletions
+1
-4
app/controllers/projects/pipelines_controller.rb
app/controllers/projects/pipelines_controller.rb
+0
-3
app/models/commit_status.rb
app/models/commit_status.rb
+1
-1
No files found.
app/controllers/projects/pipelines_controller.rb
View file @
a6b8d36a
...
@@ -31,9 +31,6 @@ class Projects::PipelinesController < Projects::ApplicationController
...
@@ -31,9 +31,6 @@ class Projects::PipelinesController < Projects::ApplicationController
end
end
def
show
def
show
respond_to
do
|
format
|
format
.
html
end
end
end
def
retry
def
retry
...
...
app/models/commit_status.rb
View file @
a6b8d36a
...
@@ -55,7 +55,7 @@ class CommitStatus < ActiveRecord::Base
...
@@ -55,7 +55,7 @@ class CommitStatus < ActiveRecord::Base
def
self
.
stages
def
self
.
stages
# We group by stage name, but order stages by theirs' index
# 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
end
def
self
.
status_for_stage
(
stage
)
def
self
.
status_for_stage
(
stage
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment