diff options
| author | Phil Hughes <me@iamphill.com> | 2018-11-08 13:11:25 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-11-08 13:11:25 +0000 |
| commit | 5b270431399ca14198d7684c1855de04ee8aec5e (patch) | |
| tree | 3610a9b3c37c16b60ff604756b8f1fecfb2075b0 | |
| parent | 34a145631429f95bb636ee718731c990d72abfcd (diff) | |
| parent | f9e9c92140d0f2d249aef8e30721a9a95673ae02 (diff) | |
| download | gitlab-ce-5b270431399ca14198d7684c1855de04ee8aec5e.tar.gz | |
Merge branch '53640-follow-up-from-resolve-redesign-activity-feed' into 'master'
Resolve "Follow-up from "Resolve "Redesign activity feed"""
Closes #53640
See merge request gitlab-org/gitlab-ce!22899
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/icon.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/icon.vue b/app/assets/javascripts/vue_shared/components/icon.vue index cddebfae115..a25841fc02f 100644 --- a/app/assets/javascripts/vue_shared/components/icon.vue +++ b/app/assets/javascripts/vue_shared/components/icon.vue @@ -1,6 +1,6 @@ <script> // only allow classes in images.scss e.g. s12 -const validSizes = [8, 10, 12, 16, 18, 24, 32, 48, 72]; +const validSizes = [8, 10, 12, 14, 16, 18, 24, 32, 48, 72]; let iconValidator = () => true; /* diff --git a/changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml b/changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml new file mode 100644 index 00000000000..66301329c52 --- /dev/null +++ b/changelogs/unreleased/53640-follow-up-from-resolve-redesign-activity-feed.yml @@ -0,0 +1,4 @@ +title: Adds new icon size to Vue icon component +merge_request: 22899 +author: +type: other |