diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-04 20:10:24 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-03-04 20:10:24 +0300 |
| commit | db70f74dfdb0c74866a3b753a302777e7c784241 (patch) | |
| tree | 3ff26a16d811013817281646532055ca2dbca3af | |
| parent | c01e93249da72cf91f3516da6bb48d8989335508 (diff) | |
| parent | 889026d652deadb617c1461cff17cbfa4f9fbdb9 (diff) | |
Merge branch '10084-ci_icon' into 'master'
Removes EE differences from ci_icon.vue
Closes gitlab-ee#10084
See merge request gitlab-org/gitlab-ce!25742
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/ci_icon.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_shared/components/ci_icon.vue b/app/assets/javascripts/vue_shared/components/ci_icon.vue index 2f498c4fa2a..e6f0a1c69cd 100644 --- a/app/assets/javascripts/vue_shared/components/ci_icon.vue +++ b/app/assets/javascripts/vue_shared/components/ci_icon.vue @@ -21,6 +21,7 @@ import Icon from '../../vue_shared/components/icon.vue'; * - Jobs table * - Jobs show view header * - Jobs show view sidebar + * - Linked pipelines */ const validSizes = [8, 12, 16, 18, 24, 32, 48, 72]; |