diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 12:28:57 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-10 12:28:57 +0000 |
| commit | de484b3d344038a3ea7e553f842f023e8e95e8a6 (patch) | |
| tree | 85f1e30dab148b9c29a5afc0eb9d85d377df2898 /app/views | |
| parent | f32ee822d66afcf8d6288d5e2e5660e19b18d5a7 (diff) | |
| download | gitlab-ce-fix-include-description-commit-message.tar.gz | |
Backport of EE fix in !954 - delays the initialization of MergeRequest javascript until after DOM readyfix-include-description-commit-message
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 4555b869999..07dbbb38641 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -115,11 +115,10 @@ = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title :javascript - var merge_request; - - merge_request = new MergeRequest({ - action: "#{controller.action_name}" + $(function () { + new MergeRequest({ + action: "#{controller.action_name}" + }); }); var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}"; - |