BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
10 deletions
+9
-10
ci_status_helper.rb
app/helpers/ci_status_helper.rb
+0
-4
pipeline.rb
app/models/ci/pipeline.rb
+1
-0
pipeline_entity.rb
app/serializers/pipeline_entity.rb
+1
-1
_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
...
@@ -121,8 +121,4 @@ module CiStatusHelper
status
.
respond_to?
(
:label
)
&&
status
.
respond_to?
(
:label
)
&&
status
.
respond_to?
(
:icon
)
status
.
respond_to?
(
:icon
)
end
end
def
status_title
(
pipeline
)
Ci
::
PipelinePresenter
.
new
(
pipeline
).
status_title
end
end
end
app/models/ci/pipeline.rb
View file @
25756618
...
@@ -4,6 +4,7 @@ module Ci
...
@@ -4,6 +4,7 @@ module Ci
include
HasStatus
include
HasStatus
include
Importable
include
Importable
include
AfterCommitQueue
include
AfterCommitQueue
include
Presentable
belongs_to
:project
belongs_to
:project
belongs_to
:user
belongs_to
:user
...
...
app/serializers/pipeline_entity.rb
View file @
25756618
...
@@ -84,6 +84,6 @@ class PipelineEntity < Grape::Entity
...
@@ -84,6 +84,6 @@ class PipelineEntity < Grape::Entity
end
end
def
status_tooltip
def
status_tooltip
Ci
::
PipelinePresenter
.
new
(
pipeline
).
status_title
pipeline
.
present
(
current_user:
request
.
user
).
status_title
end
end
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
.content-block.build-header.top-area
.header-content
.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
Job
%strong
.js-build-id
##{@build.id}
%strong
.js-build-id
##{@build.id}
in pipeline
in pipeline
=
link_to
pipeline_path
(
@build
.
pipeline
)
do
=
link_to
pipeline_path
(
pipeline
)
do
%strong
##{
@build.
pipeline.id}
%strong
##{pipeline.id}
for commit
for commit
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@build
.
pipeline
.
sha
)
do
=
link_to
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
pipeline
.
sha
)
do
%strong
=
@build
.
pipeline
.
short_sha
%strong
=
pipeline
.
short_sha
from
from
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@build
.
ref
)
do
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@build
.
ref
)
do
%code
%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