diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-24 14:41:36 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-24 14:41:36 +0300 |
commit | 541da4d51f3e8abfccbbfc7301d8c133fd0fcd35 (patch) | |
tree | d62d10139cee507a3af7e1654a9f4785e4c8c334 /app | |
parent | e622259d5be95ede9b4f52b0e654cdf0a7a4323f (diff) | |
parent | 42da7cd375a615d0ba092495981682bafdb99b47 (diff) |
Merge branch 'issue_4189' into 'master'
Fix redirect to wrong URL when merging and MR detail URL has an anchor.
Closes #4189
See merge request !2169
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/merge_request_widget.js.coffee | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_request_widget.js.coffee b/app/assets/javascripts/merge_request_widget.js.coffee index c4b63966fe7..738ffc8343b 100644 --- a/app/assets/javascripts/merge_request_widget.js.coffee +++ b/app/assets/javascripts/merge_request_widget.js.coffee @@ -18,7 +18,7 @@ class @MergeRequestWidget if data.state == "merged" urlSuffix = if deleteSourceBranch then '?delete_source=true' else '' - window.location.href = window.location.href + urlSuffix + window.location.href = window.location.pathname + urlSuffix else if data.merge_error $('.mr-widget-body').html("<h4>" + data.merge_error + "</h4>") else |