diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 20:36:28 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 20:36:28 +0000 |
| commit | a90a22a7743028a260d7b1f3105b80700a10287e (patch) | |
| tree | bebc8c433c47000c0eac1426150de70a74206992 /app/assets/javascripts/vue_shared/components/header_ci_component.vue | |
| parent | 11aa990da7794038aef09dd023b85e81b5ac6c4f (diff) | |
| parent | 296a4e6825a3528917bb385123cdf62ae3d1944e (diff) | |
| download | gitlab-ce-a90a22a7743028a260d7b1f3105b80700a10287e.tar.gz | |
Merge branch 'master' into 'boards-bundle-refactor'
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/header_ci_component.vue')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/header_ci_component.vue | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/javascripts/vue_shared/components/header_ci_component.vue b/app/assets/javascripts/vue_shared/components/header_ci_component.vue index 1f72dea1b33..a0cd0cbd200 100644 --- a/app/assets/javascripts/vue_shared/components/header_ci_component.vue +++ b/app/assets/javascripts/vue_shared/components/header_ci_component.vue @@ -6,12 +6,12 @@ import userAvatarImage from './user_avatar/user_avatar_image.vue'; /** - * Renders header component for job and pipeline page based on UI mockups - * - * Used in: - * - job show page - * - pipeline show page - */ + * Renders header component for job and pipeline page based on UI mockups + * + * Used in: + * - job show page + * - pipeline show page + */ export default { components: { ciIconBadge, @@ -118,7 +118,8 @@ <section class="header-action-buttons" - v-if="actions.length"> + v-if="actions.length" + > <template v-for="(action, i) in actions" > |