diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-24 21:28:27 +0000 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-24 21:28:27 +0000 |
commit | 7fa0c7662b88efa72d29087a273f0b6c1e484b3e (patch) | |
tree | 067404591d3ace269a84ac6e3c0f9bde0165ecf6 | |
parent | 7595e3ba59680f56e51c8d41579106af33af2f0e (diff) | |
parent | 2246bb7d22498565d77c4b8fa05f50b27db09ec8 (diff) | |
download | gitlab-ce-7fa0c7662b88efa72d29087a273f0b6c1e484b3e.tar.gz |
Merge branch '64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded' into 'master'
Changed `author_avatar` to inline-block class
Closes #64746
See merge request gitlab-org/gitlab-ce!30904
-rw-r--r-- | app/helpers/avatars_helper.rb | 2 | ||||
-rw-r--r-- | changelogs/unreleased/64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb index 5906ddabee4..81ff359556d 100644 --- a/app/helpers/avatars_helper.rb +++ b/app/helpers/avatars_helper.rb @@ -52,7 +52,7 @@ module AvatarsHelper user: commit_or_event.author, user_name: commit_or_event.author_name, user_email: commit_or_event.author_email, - css_class: 'd-none d-sm-inline' + css_class: 'd-none d-sm-inline-block' })) end diff --git a/changelogs/unreleased/64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded.yml b/changelogs/unreleased/64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded.yml new file mode 100644 index 00000000000..fb0f4cedc62 --- /dev/null +++ b/changelogs/unreleased/64746-Commit-authors-avatar-sretched-in-commit-view-if-no-image-is-loaded.yml @@ -0,0 +1,5 @@ +--- +title: Fixed distorted avatars when resource not reachable +merge_request: 30904 +author: Marc Schwede +type: other |