From c6b5ec0fd87a9a7ddea67f6b628fa1a65cdef3c2 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Tue, 25 Apr 2017 13:24:27 -0500 Subject: Update MR diff blob_fork_suggestion after jQuery update `.init()` was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858 We need to add it the MR diff instance that was added in a separate MR and of course didn't add a conflict because it is a completely different piece --- app/assets/javascripts/merge_request_tabs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 6075157ec31..93c30c54a8e 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -275,7 +275,8 @@ import BlobForkSuggestion from './blob/blob_fork_suggestion'; cancelButtons: $(el).find('.js-cancel-fork-suggestion-button'), suggestionSections: $(el).find('.js-file-fork-suggestion-section'), actionTextPieces: $(el).find('.js-file-fork-suggestion-section-action'), - }); + }) + .init(); }); }, }); -- cgit v1.2.1