diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-06 13:25:18 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-06 13:25:18 +0000 |
commit | e5d32c2c0cf37d7feeabaadd4b7f2e8523a3cd03 (patch) | |
tree | 8612413f97a1794e1c9375566658787434a688bf /app/assets | |
parent | cf9a8cda568891d6012a59cadf79cd56cc30ca13 (diff) | |
parent | 9296d47352df0e7afdd5c5abce6e82476049bef4 (diff) | |
download | gitlab-ce-e5d32c2c0cf37d7feeabaadd4b7f2e8523a3cd03.tar.gz |
Merge branch '43246-checkfilter' into 'master'
Resolve "Show a message when loading the issues / merge requests dashboard without filters"
Closes #43246
See merge request gitlab-org/gitlab-ce!17961
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/search_autocomplete.js | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/images.scss | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js b/app/assets/javascripts/search_autocomplete.js index 7dd3e9858c6..2da022fde63 100644 --- a/app/assets/javascripts/search_autocomplete.js +++ b/app/assets/javascripts/search_autocomplete.js @@ -233,21 +233,21 @@ export default class SearchAutocomplete { const issueItems = [ { text: 'Issues assigned to me', - url: `${issuesPath}/?assignee_username=${userName}`, + url: `${issuesPath}/?assignee_id=${userId}`, }, { text: "Issues I've created", - url: `${issuesPath}/?author_username=${userName}`, + url: `${issuesPath}/?author_id=${userId}`, }, ]; const mergeRequestItems = [ { text: 'Merge requests assigned to me', - url: `${mrPath}/?assignee_username=${userName}`, + url: `${mrPath}/?assignee_id=${userId}`, }, { text: "Merge requests I've created", - url: `${mrPath}/?author_username=${userName}`, + url: `${mrPath}/?author_id=${userId}`, }, ]; diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss index df1cafc9f8e..62a0fba3da3 100644 --- a/app/assets/stylesheets/framework/images.scss +++ b/app/assets/stylesheets/framework/images.scss @@ -20,7 +20,7 @@ width: 100%; } - $image-widths: 80 250 306 394 430; + $image-widths: 80 130 250 306 394 430; @each $width in $image-widths { &.svg-#{$width} { img, |