diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-11 08:00:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-11 08:00:29 +0000 |
| commit | b514a5ee06538baf13a068ef8a7785528d7e737b (patch) | |
| tree | f939a2901937fda10a327c8a239f3affb6f2e89c | |
| parent | f1f506fcf235eb53f3b4e55bc04ffac5f5e4108c (diff) | |
| parent | e6ef058289f3044964f7538043ba50d9e9fcafe3 (diff) | |
| download | gitlab-ce-b514a5ee06538baf13a068ef8a7785528d7e737b.tar.gz | |
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:
Closes #2241
See merge request !1131
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/import/bitbucket/status.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 74b41106b97..816031ca8ed 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ 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) diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml index 98ae509096e..777eb482714 100644 --- 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. diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index d49eacb30dd..d25fe68242b 100644 --- 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 |