diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-13 14:59:41 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-13 14:59:41 +0000 |
| commit | 86fdbb0074f2443c15594962a6268d4779cd05c4 (patch) | |
| tree | 85f1e30dab148b9c29a5afc0eb9d85d377df2898 | |
| parent | f32ee822d66afcf8d6288d5e2e5660e19b18d5a7 (diff) | |
| parent | de484b3d344038a3ea7e553f842f023e8e95e8a6 (diff) | |
| download | gitlab-ce-86fdbb0074f2443c15594962a6268d4779cd05c4.tar.gz | |
Merge branch 'fix-include-description-commit-message' into '8-16-stable'
Backport of EE - delays the initialization of MergeRequest javascrip…
See merge request !9132
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 9 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-include-description-commit-message.yml | 4 |
2 files changed, 8 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)}"; - diff --git a/changelogs/unreleased/fix-include-description-commit-message.yml b/changelogs/unreleased/fix-include-description-commit-message.yml new file mode 100644 index 00000000000..658e6360453 --- /dev/null +++ b/changelogs/unreleased/fix-include-description-commit-message.yml @@ -0,0 +1,4 @@ +--- +title: backport of EE fix !954 +merge_request: +author: |