Commit b514a5ee authored by Douwe Maan's avatar Douwe Maan

Merge branch 'disable-turbolinks-for-bitbucket' into 'master'

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 occurred:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/18a8a76bb99a2c9accb0805c23785c1e/image.png)

Closes #2241

See merge request !1131
parents f1f506fc e6ef0582
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)
......
......@@ -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.
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment