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
2969b2a8
Commit
2969b2a8
authored
May 08, 2018
by
Olivier Gonzalez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CE to EE merge conflict
parent
7e43bd5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
app/views/projects/pipelines/_with_tabs.html.haml
app/views/projects/pipelines/_with_tabs.html.haml
+0
-6
No files found.
app/views/projects/pipelines/_with_tabs.html.haml
View file @
2969b2a8
<
<<<<<<
HEAD
-
expose_sast_data
=
@pipeline
.
expose_sast_data?
-
expose_dependency_data
=
@pipeline
.
expose_dependency_scanning_data?
-
blob_path
=
project_blob_path
(
@project
,
@pipeline
.
sha
)
==
=====
>
>>>>>> upstream/master
.tabs-holder
%ul
.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator
%li
.js-pipeline-tab-link
...
...
@@ -19,14 +16,11 @@
=
link_to
failures_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'#js-tab-failures'
,
action:
'failures'
,
toggle:
'tab'
},
class:
'failures-tab'
do
=
_
(
"Failed Jobs"
)
%span
.badge.js-failures-counter
=
@pipeline
.
failed_builds
.
count
<
<<<<<<
HEAD
-
if
expose_sast_data
||
expose_dependency_data
%li
.js-security-tab-link
=
link_to
security_project_pipeline_path
(
@project
,
@pipeline
),
data:
{
target:
'#js-tab-security'
,
action:
'security'
,
toggle:
'tab'
},
class:
'security-tab'
do
=
_
(
"Security report"
)
%span
.badge.js-sast-counter.hidden
==
=====
>
>>>>>> upstream/master
.tab-content
#js-tab-pipeline
.tab-pane
...
...
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