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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
25756618
Commit
25756618
authored
Mar 28, 2017
by
Rydkin Maxim
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace helper with decorator
parent
b9f7d4b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+0
-4
app/models/ci/pipeline.rb
app/models/ci/pipeline.rb
+1
-0
app/serializers/pipeline_entity.rb
app/serializers/pipeline_entity.rb
+1
-1
app/views/projects/builds/_header.html.haml
app/views/projects/builds/_header.html.haml
+7
-5
No files found.
app/helpers/ci_status_helper.rb
View file @
25756618
...
...
@@ -121,8 +121,4 @@ module CiStatusHelper
status
.
respond_to?
(
:label
)
&&
status
.
respond_to?
(
:icon
)
end
def
status_title
(
pipeline
)
Ci
::
PipelinePresenter
.
new
(
pipeline
).
status_title
end
end
app/models/ci/pipeline.rb
View file @
25756618
...
...
@@ -4,6 +4,7 @@ module Ci
include
HasStatus
include
Importable
include
AfterCommitQueue
include
Presentable
belongs_to
:project
belongs_to
:user
...
...
app/serializers/pipeline_entity.rb
View file @
25756618
...
...
@@ -84,6 +84,6 @@ class PipelineEntity < Grape::Entity
end
def
status_tooltip
Ci
::
PipelinePresenter
.
new
(
pipeline
).
status_title
pipeline
.
present
(
current_user:
request
.
user
).
status_title
end
end
app/views/projects/builds/_header.html.haml
View file @
25756618
-
pipeline
=
@build
.
pipeline
.
present
(
current_user:
current_user
)
.content-block.build-header.top-area
.header-content
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
),
link:
false
,
title:
status_title
(
@build
.
pipeline
)
=
render
'ci/status/badge'
,
status:
@build
.
detailed_status
(
current_user
),
link:
false
,
title:
pipeline
.
status_title
Job
%strong
.js-build-id
##{@build.id}
in pipeline
=
link_to
pipeline_path
(
@build
.
pipeline
)
do
%strong
##{
@build.
pipeline.id}
=
link_to
pipeline_path
(
pipeline
)
do
%strong
##{pipeline.id}
for commit
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@build
.
pipeline
.
sha
)
do
%strong
=
@build
.
pipeline
.
short_sha
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
)
do
%strong
=
pipeline
.
short_sha
from
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@build
.
ref
)
do
%code
...
...
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