diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-16 15:05:01 +0000 |
| commit | 6384aedace16fff336ff2a29d526ad8fcdfc2b84 (patch) | |
| tree | f8699aff6fb0d4e1a646d76ff2720520cd7c0652 /app/assets/javascripts/pipelines/components | |
| parent | b3d8b85f6520c8f89690a8f0e3ab96f5e6740cb2 (diff) | |
| parent | 5d6fb753ef3288c3da7e63470b7acd3694d86137 (diff) | |
| download | gitlab-ce-6384aedace16fff336ff2a29d526ad8fcdfc2b84.tar.gz | |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/admin/application_settings/_signin.html.haml
Diffstat (limited to 'app/assets/javascripts/pipelines/components')
| -rw-r--r-- | app/assets/javascripts/pipelines/components/stage.vue | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipelines/components/stage.vue b/app/assets/javascripts/pipelines/components/stage.vue index b3fcaf0ccd1..32cf3dba3c3 100644 --- a/app/assets/javascripts/pipelines/components/stage.vue +++ b/app/assets/javascripts/pipelines/components/stage.vue @@ -1,5 +1,4 @@ <script> - import $ from 'jquery'; /** * Renders each stage of the pipeline mini graph. @@ -13,8 +12,11 @@ * 3. Merge request widget * 4. Commit widget */ - import axios from '../../lib/utils/axios_utils'; + + import $ from 'jquery'; import Flash from '../../flash'; + import axios from '../../lib/utils/axios_utils'; + import eventHub from '../event_hub'; import Icon from '../../vue_shared/components/icon.vue'; import LoadingIcon from '../../vue_shared/components/loading_icon.vue'; import tooltip from '../../vue_shared/directives/tooltip'; @@ -82,6 +84,7 @@ methods: { onClickStage() { if (!this.isDropdownOpen()) { + eventHub.$emit('clickedDropdown'); this.isLoading = true; this.fetchJobs(); } |