diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-10 15:09:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-10 15:09:55 +0300 |
| commit | bf593ae68b7135bf633484aa3442b7592126b1d2 (patch) | |
| tree | 6f88f48f73fbb40d7f9bb7611f0bb23609de6586 /app/assets/javascripts/merge_request_tabs.js | |
| parent | 895ab10efae5b66a3bc96955f33059ca5979825b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index eb2a88b2da8..a1b7f917595 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -167,8 +167,6 @@ export default class MergeRequestTabs { if (this.setUrl) { this.setCurrentAction(action); } - - this.eventHub.$emit('MergeRequestTabChange', this.getCurrentAction()); } } } @@ -252,6 +250,8 @@ export default class MergeRequestTabs { } } } + + this.eventHub.$emit('MergeRequestTabChange', action); } scrollToElement(container) { |