Skip to content
Snippets Groups Projects

gitlab.com issue #229 - no_avatar.png path in coffee

Created by: MrMarvin

Since upgrading to 6.8-stable we encountered the bug described here: https://gitlab.com/gitlab-org/gitlab-ce/issues/229

This commit fixes the hard coded path to the .png to use the asset pipeline instead.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Created by: aerialls

    :thumbsup:

    By Administrator on 2014-05-10T16:30:20 (imported from GitLab project)

    By Administrator on 2014-05-10T16:30:20 (imported from GitLab)

  • Created by: dblessing

    @MrMarvin Thanks for your contribution. GitLab does not use ERB templates. Can you please change this to use the syntax provided by coffee instead? #{var_name}? Make sure the file names return to normal (without .erb).

    By Administrator on 2014-05-11T01:11:12 (imported from GitLab project)

    By Administrator on 2014-05-11T01:11:12 (imported from GitLab)

  • Created by: MrMarvin

    @dblessing Thank you for your suggestion. I am not familiar with the asset pipeline. Although I'm still a bit puzzled how this works now (looking at the compiled javascript code it doesnt show the proper no_avatar-somehash.pngpath), it renders as the correct image tag. Please see my (squashed) commit.

    By Administrator on 2014-05-16T10:04:48 (imported from GitLab project)

    By Administrator on 2014-05-16T10:04:48 (imported from GitLab)

  • Created by: Wachiwi

    :thumbsup: nice one!

    By Administrator on 2014-05-20T10:19:23 (imported from GitLab project)

    By Administrator on 2014-05-20T10:19:23 (imported from GitLab)

  • Created by: jacobvosmaer

    @maxlazio could you have a look at this PR?

    @MrMarvin your PR should target master, not 6-8-stable.

    By Administrator on 2014-05-23T08:03:43 (imported from GitLab project)

    By Administrator on 2014-05-23T08:03:43 (imported from GitLab)

  • Created by: MrMarvin

    @jacobvosmaer I have the feeling that this should target to be in 6.8.3 and therefore I made my changes against that branch. If you however prefer it to be rebased to current master (merge it from there), I can do so.

    By Administrator on 2014-05-23T09:18:21 (imported from GitLab project)

    By Administrator on 2014-05-23T09:18:21 (imported from GitLab)

  • Created by: MrMarvin

    I rebased onto current master, however I cant change the supposed target of this PR and this now looks quite messy. Please pull this to whatever branch to feel appropriate.

    By Administrator on 2014-05-23T09:32:20 (imported from GitLab project)

    By Administrator on 2014-05-23T09:32:20 (imported from GitLab)

  • Created by: MrMarvin

    closed in favor of PR #7012

    By Administrator on 2014-05-23T09:59:52 (imported from GitLab project)

    By Administrator on 2014-05-23T09:59:52 (imported from GitLab)

  • Created by: jacobvosmaer

    @MrMarvin thanks for creating the PR to master. Our priority is always to fix things on master first; it happened too often that a fix got merged into a stable branch and then forgotten, so that the problem came back on the next release!

    By Administrator on 2014-05-23T10:13:00 (imported from GitLab project)

    By Administrator on 2014-05-23T10:13:00 (imported from GitLab)

Please register or sign in to reply
Loading