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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
47e06146
Commit
47e06146
authored
Jan 20, 2015
by
GitLab
Committed by
Bartlomiej Swiecki
Jan 20, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable turbolink on links pointing out to ci services
parent
0af2a161
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/projects/merge_requests/show/_mr_ci.html.haml
app/views/projects/merge_requests/show/_mr_ci.html.haml
+3
-3
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+2
-2
No files found.
app/views/projects/merge_requests/show/_mr_ci.html.haml
View file @
47e06146
...
@@ -3,21 +3,21 @@
...
@@ -3,21 +3,21 @@
%i
.fa.fa-check
%i
.fa.fa-check
%span
CI build passed
%span
CI build passed
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
,
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget.ci-failed
{
style:
"display:none"
}
.ci_widget.ci-failed
{
style:
"display:none"
}
%i
.fa.fa-times
%i
.fa.fa-times
%span
CI build failed
%span
CI build failed
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
,
:"data-no-turbolink"
=>
"data-no-turbolink"
-
[
:running
,
:pending
].
each
do
|
status
|
-
[
:running
,
:pending
].
each
do
|
status
|
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
.ci_widget
{
class:
"ci-#{status}"
,
style:
"display:none"
}
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
%span
CI build
#{
status
}
%span
CI build
#{
status
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
=
link_to
"Build page"
,
ci_build_details_path
(
@merge_request
)
,
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget
.ci_widget
%i
.fa.fa-spinner
%i
.fa.fa-spinner
...
...
app/views/projects/show.html.haml
View file @
47e06146
...
@@ -68,11 +68,11 @@
...
@@ -68,11 +68,11 @@
-
@project
.
ci_services
.
each
do
|
ci_service
|
-
@project
.
ci_services
.
each
do
|
ci_service
|
-
if
ci_service
.
active?
&&
ci_service
.
respond_to?
(
:builds_path
)
-
if
ci_service
.
active?
&&
ci_service
.
respond_to?
(
:builds_path
)
-
if
ci_service
.
respond_to?
(
:status_img_path
)
-
if
ci_service
.
respond_to?
(
:status_img_path
)
=
link_to
ci_service
.
builds_path
do
=
link_to
ci_service
.
builds_path
,
:'data-no-turbolink'
=>
'data-no-turbolink'
do
=
image_tag
ci_service
.
status_img_path
,
alt:
"build status"
=
image_tag
ci_service
.
status_img_path
,
alt:
"build status"
-
else
-
else
%span
.light
CI provided by
%span
.light
CI provided by
=
link_to
ci_service
.
title
,
ci_service
.
builds_path
=
link_to
ci_service
.
title
,
ci_service
.
builds_path
,
:'data-no-turbolink'
=>
'data-no-turbolink'
-
if
readme
-
if
readme
.tab-pane
#tab-readme
.tab-pane
#tab-readme
...
...
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