diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-02 08:23:07 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-02 08:23:07 +0000 |
| commit | 209d7575b63ed889036707eea0183c1ff4bfd67d (patch) | |
| tree | d366283eb0e8972e9c9790a7ab7aaf0589dddf8e /app/helpers | |
| parent | 147c46cca195f13ef10ec8fc2db160a833121914 (diff) | |
| parent | feae8b2e44ee66c572efeab2575234de292ac01e (diff) | |
| download | gitlab-ce-209d7575b63ed889036707eea0183c1ff4bfd67d.tar.gz | |
Merge branch '34366-issue-sidebar-don-t-render-participants-in-collapsed-state' into 'master'
Resolve "Issue Sidebar : Don't render participants in collapsed state"
Closes #34366
See merge request gitlab-org/gitlab-ce!14270
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects_helper.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 21fb17e06d6..4c0cce54527 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -21,11 +21,14 @@ module ProjectsHelper classes = %W[avatar avatar-inline s#{opts[:size]}] classes << opts[:avatar_class] if opts[:avatar_class] - image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: classes, alt: '') + avatar = avatar_icon(author, opts[:size]) + src = opts[:lazy_load] ? nil : avatar + + image_tag(src, width: opts[:size], class: classes, alt: '', "data-src" => avatar) end def link_to_member(project, author, opts = {}, &block) - default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false } + default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false, lazy_load: false } opts = default_opts.merge(opts) return "(deleted)" unless author |