Disable turbolinks when linking to Bitbucket import status

Turbolinks was causing issues with the Bitbucket Javascript/display because it was trying to intercept /import/bitbucket/status even when a 302 redirection occured. Closes #2241

Disable turbolinks when linking to Bitbucket import status
e6ef0582 · Stan Hu · 01af2c98 · e6ef0582 · e6ef0582 · e6ef0582
Commit e6ef0582 authored Aug 10, 2015 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

status.html.haml app/views/import/bitbucket/status.html.haml +1 -1

new.html.haml app/views/projects/new.html.haml +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.

 v 7.14.0 (unreleased)
+  - Disable turbolinks when linking to Bitbucket import status (Stan Hu)
  - Fix corrupted binary files when using API files endpoint (Stan Hu)
  - Show incompatible projects in Bitbucket import status (Stan Hu)
  - Fix coloring of diffs on MR Discussion-tab (Gert Goet)

--- a/app/views/import/bitbucket/status.html.haml
+++ b/app/views/import/bitbucket/status.html.haml
@@ -61,7 +61,7 @@
    rather than Git. Please convert
    = link_to "them to Git,", "https://www.atlassian.com/git/tutorials/migrating-overview"
    and go through the
-    = link_to "import flow", status_import_bitbucket_path
+    = link_to "import flow", status_import_bitbucket_path, "data-no-turbolink" => "true"
    again.



--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -40,7 +40,7 @@


            - if bitbucket_import_enabled?
-              = link_to status_import_bitbucket_path, class: 'btn' do
+              = link_to status_import_bitbucket_path, class: 'btn', "data-no-turbolink" => "true" do
                %i.fa.fa-bitbucket
                Bitbucket
            - else