diff options
| -rw-r--r-- | app/assets/javascripts/boards/models/user.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/boards/utils/default_avatar.js | 1 | ||||
| -rw-r--r-- | app/helpers/boards_helper.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/issue-boards-no-avatar.yml | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/user.js b/app/assets/javascripts/boards/models/user.js index 8e9de4d4cbb..875c21a37d3 100644 --- a/app/assets/javascripts/boards/models/user.js +++ b/app/assets/javascripts/boards/models/user.js @@ -1,11 +1,12 @@ /* eslint-disable no-unused-vars */ +import defaultAvatar from '../utils/default_avatar'; class ListUser { constructor(user) { this.id = user.id; this.name = user.name; this.username = user.username; - this.avatar = user.avatar_url; + this.avatar = user.avatar_url || defaultAvatar(); } } diff --git a/app/assets/javascripts/boards/utils/default_avatar.js b/app/assets/javascripts/boards/utils/default_avatar.js new file mode 100644 index 00000000000..062ffec6dce --- /dev/null +++ b/app/assets/javascripts/boards/utils/default_avatar.js @@ -0,0 +1 @@ +export default () => document.getElementById('board-app').dataset.defaultAvatar; diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index f43827da446..e2df52e3833 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -9,6 +9,7 @@ module BoardsHelper issue_link_base: namespace_project_issues_path(@project.namespace, @project), root_path: root_path, bulk_update_path: bulk_update_namespace_project_issues_path(@project.namespace, @project), + default_avatar: image_path(default_avatar) } end end diff --git a/changelogs/unreleased/issue-boards-no-avatar.yml b/changelogs/unreleased/issue-boards-no-avatar.yml new file mode 100644 index 00000000000..a2dd53b3f2f --- /dev/null +++ b/changelogs/unreleased/issue-boards-no-avatar.yml @@ -0,0 +1,4 @@ +--- +title: Fixed avatar not display on issue boards when Gravatar is disabled +merge_request: +author: |