diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-02-14 22:01:20 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-02-14 22:01:20 -0500 |
| commit | 60f299b5969cbb7d5f574f7257c6feaabbf0610b (patch) | |
| tree | 59f38eff6f58f064bc0bc8669b5585ffff878ba5 | |
| parent | f2218753dedd963024c29d6a16e93bc419c66a4e (diff) | |
| parent | 86fdbb0074f2443c15594962a6268d4779cd05c4 (diff) | |
| download | gitlab-ce-60f299b5969cbb7d5f574f7257c6feaabbf0610b.tar.gz | |
Merge remote-tracking branch 'origin/8-16-stable' into 8-16-stable
| -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: |