diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-17 14:01:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-17 14:01:30 +0000 |
| commit | 534d480993db74a728bc3a91ce00e00504d840cb (patch) | |
| tree | 25b5df6c135e32dbc0465caa3b418725be455ee6 | |
| parent | 522eb17923271726a5b1ad588c6e5898d498752b (diff) | |
| parent | c569f8b4800424704691925f9e39b415b5eca33c (diff) | |
| download | gitlab-ce-534d480993db74a728bc3a91ce00e00504d840cb.tar.gz | |
Merge branch 'fix/13517-impossible-subsequent-issuable-edits-in-sidebar' into 'master'
Fix a bug preventing from doing subsequent edits in any Issuable sidebar
Fixes #13517. Fixes #12572.
### Issue
---
### Merge request
/cc @jschatz1 @sytses
See merge request !2848
| -rw-r--r-- | app/views/projects/issues/update.js.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/update.js.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/issues/update.js.haml b/app/views/projects/issues/update.js.haml index a54733883b4..986d8c220db 100644 --- a/app/views/projects/issues/update.js.haml +++ b/app/views/projects/issues/update.js.haml @@ -1,3 +1,3 @@ $('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @issue)}"; $('aside.right-sidebar').effect('highlight'); -new Issue();
\ No newline at end of file +new IssuableContext(); diff --git a/app/views/projects/merge_requests/update.js.haml b/app/views/projects/merge_requests/update.js.haml index ce5157d69a2..9cce5660e1c 100644 --- a/app/views/projects/merge_requests/update.js.haml +++ b/app/views/projects/merge_requests/update.js.haml @@ -1,3 +1,3 @@ -$('aside.right-sidebar')[0].outerHTML= "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @merge_request)}"; -$('aside.right-sidebar').effect('highlight') -merge_request = new MergeRequest(); +$('aside.right-sidebar')[0].outerHTML = "#{escape_javascript(render 'shared/issuable/sidebar', issuable: @merge_request)}"; +$('aside.right-sidebar').effect('highlight'); +new IssuableContext(); |