diff options
author | GitLab <gitlab@micazook.com> | 2015-01-20 02:22:40 +0300 |
---|---|---|
committer | Bartlomiej Swiecki <bartlomiej.swiecki@micazook.com> | 2015-01-20 14:19:16 +0300 |
commit | 47e061466968dac72ba488eee0d3c44f568b11ab (patch) | |
tree | 60f45ca40a625588a749ea4858136a4e6f620995 /app/views | |
parent | 0af2a161fa55a4abd7f8248b25a7361b209ecc4a (diff) |
Disable turbolink on links pointing out to ci services
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/merge_requests/show/_mr_ci.html.haml | 6 | ||||
-rw-r--r-- | app/views/projects/show.html.haml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_ci.html.haml b/app/views/projects/merge_requests/show/_mr_ci.html.haml index 941b15d3b32..ee7fd0ef157 100644 --- a/app/views/projects/merge_requests/show/_mr_ci.html.haml +++ b/app/views/projects/merge_requests/show/_mr_ci.html.haml @@ -3,21 +3,21 @@ %i.fa.fa-check %span CI build passed 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"} %i.fa.fa-times %span CI build failed 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| .ci_widget{class: "ci-#{status}", style: "display:none"} %i.fa.fa-clock-o %span CI build #{status} 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 %i.fa.fa-spinner diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index af6e4567c1b..737a34decde 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -68,11 +68,11 @@ - @project.ci_services.each do |ci_service| - if ci_service.active? && ci_service.respond_to?(:builds_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" - else %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 .tab-pane#tab-readme |