BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 86fdbb00 by Clement Ho
Options

Merge branch 'fix-include-description-commit-message' into '8-16-stable'

Backport of EE - delays the initialization of MergeRequest javascrip… See merge request !9132
parents f32ee822 de484b3d
Showing with 8 additions and 5 deletions
app/views/projects/merge_requests/_show.html.haml
...@@ -115,11 +115,10 @@ ...@@ -115,11 +115,10 @@
= render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title = render "projects/commit/change", type: 'cherry-pick', commit: @merge_request.merge_commit, title: @merge_request.title
:javascript :javascript
var merge_request; $(function () {
new MergeRequest({
merge_request = new MergeRequest({ action: "#{controller.action_name}"
action: "#{controller.action_name}" });
}); });
var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}"; var mrRefreshWidgetUrl = "#{mr_widget_refresh_url(@merge_request)}";
changelogs/unreleased/fix-include-description-commit-message.yml 0 → 100644
---
title: backport of EE fix !954
merge_request:
author:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment