diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-04-25 13:24:27 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-04-25 13:24:27 -0500 |
| commit | c6b5ec0fd87a9a7ddea67f6b628fa1a65cdef3c2 (patch) | |
| tree | cb847b51b2974b017e25bfcdf232535202bbeead | |
| parent | cc52dfab92116ca91fda37e07ad9cef21a62ce69 (diff) | |
| download | gitlab-ce-update-mr-diff-blob-fork-suggestion-after-jquery-udpate.tar.gz | |
Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpate
`.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
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 3 |
1 files changed, 2 insertions, 1 deletions
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(); }); }, }); |