Skip to content
Snippets Groups Projects

Fix avatars in the network graph for relative-url setups.

Merged Fix avatars in the network graph for relative-url setups.
github/fork/thmo/6-7-stable into 6-7-stable
Merged gitlab-qa-bot requested to merge github/fork/thmo/6-7-stable into 6-7-stable

Created by: thmo

This fixes the avatar URL in case there is a relative URL root.

Merge request reports

Merged by avatar (Mar 8, 2025 3:01pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
app/assets/javascripts/branch-graph.js.coffee
201 201 stroke: @colors[commit.space]
202 202 "stroke-width": 2
203 203 )
204 r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
204 r.image(gon.relative_url_root + commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    Where is the gon var coming from?

    By Administrator on 2014-04-07T17:46:53 (imported from GitLab project)

    By Administrator on 2014-04-07T17:46:53 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot started a thread on commit 5bae15be
    • app/assets/javascripts/branch-graph.js.coffee
    201 201 stroke: @colors[commit.space]
    202 202 "stroke-width": 2
    203 203 )
    204 r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
    204 r.image(gon.relative_url_root + commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot started a thread on commit 5bae15be
    • app/assets/javascripts/branch-graph.js.coffee
    201 201 stroke: @colors[commit.space]
    202 202 "stroke-width": 2
    203 203 )
    204 r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
    204 r.image(gon.relative_url_root + commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot started a thread on commit 5bae15be
    • app/assets/javascripts/branch-graph.js.coffee
    201 201 stroke: @colors[commit.space]
    202 202 "stroke-width": 2
    203 203 )
    204 r.image(commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
    204 r.image(gon.relative_url_root + commit.author.icon, avatar_box_x, avatar_box_y, 20, 20)
    • gitlab-qa-bot
      gitlab-qa-bot @gitlab-qa-bot ·
      Author Owner

      Created by: jvanbaarsen

      Ok, Thanks!

      By Administrator on 2014-04-07T18:18:57 (imported from GitLab project)

      By Administrator on 2014-04-07T18:18:57 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    @randx Seems ok to merge

    By Administrator on 2014-04-07T18:19:30 (imported from GitLab project)

    By Administrator on 2014-04-07T18:19:30 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: Razer6

    @randx This one is gone to 6-7 stable branch. I don't know if it was intended.

    By Administrator on 2014-04-08T12:19:59 (imported from GitLab project)

    By Administrator on 2014-04-08T12:19:59 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    @razer6 / @randx Sorry, totally overlooked it. Will pay closer attention next time!

    By Administrator on 2014-04-08T12:27:53 (imported from GitLab project)

    By Administrator on 2014-04-08T12:27:53 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: thmo

    Actually this needs to be fixed on master as well. Should I prepare an additional pull request?

    By Administrator on 2014-04-08T12:28:50 (imported from GitLab project)

    By Administrator on 2014-04-08T12:28:50 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    @thmo Yeah please :smile:

    By Administrator on 2014-04-08T12:43:20 (imported from GitLab project)

    By Administrator on 2014-04-08T12:43:20 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    ooops. It was stable branch :(

    By Administrator on 2014-04-10T07:54:22 (imported from GitLab project)

    By Administrator on 2014-04-10T07:54:22 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: maxlazio

    I will revert this on the stable branch because we didn't test this and it doesn't make any sense to have an untested code in stable.

    By Administrator on 2014-04-10T07:56:05 (imported from GitLab project)

    By Administrator on 2014-04-10T07:56:05 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: Razer6

    @maxlazio Could you cherry-pick this to master?

    By Administrator on 2014-04-10T08:04:33 (imported from GitLab project)

    By Administrator on 2014-04-10T08:04:33 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: maxlazio

    @razer6 Already done :)

    By Administrator on 2014-04-10T08:07:18 (imported from GitLab project)

    By Administrator on 2014-04-10T08:07:18 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: maxlazio

    @thmo No need for a new PR. Thanks

    By Administrator on 2014-04-10T08:07:36 (imported from GitLab project)

    By Administrator on 2014-04-10T08:07:36 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: Razer6

    Yeah great!

    By Administrator on 2014-04-10T08:07:48 (imported from GitLab project)

    By Administrator on 2014-04-10T08:07:48 (imported from GitLab)

    • Please register or sign in to reply