diff options
| author | John T Skarbek <jtslear@gmail.com> | 2019-03-04 14:45:08 -0500 |
|---|---|---|
| committer | John T Skarbek <jtslear@gmail.com> | 2019-03-04 14:45:08 -0500 |
| commit | ad220b8b0f8319a9574ed2c490206ade63f22d44 (patch) | |
| tree | 37469f16101018bb3fe1eb3728257fac6425da03 /app/assets | |
| parent | e4e0ed92f25027a8873245b02d44003e4e44daef (diff) | |
| parent | 5c80bbb33c12490bc5fa711642a40fc16bdb79a4 (diff) | |
| download | gitlab-ce-ad220b8b0f8319a9574ed2c490206ade63f22d44.tar.gz | |
Merge remote-tracking branch 'origin/master' into 11-9-stable
Diffstat (limited to 'app/assets')
| -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]; |