diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-06-22 04:18:45 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-22 16:55:33 +0300 |
| commit | ad1158837ef6028a4b43550cd264f7f80284d019 (patch) | |
| tree | 377e9a2707ceb873d596279b5d1382410aa7f638 | |
| parent | 1e34a81cd445fce7d236821764ac6e8c474dff2c (diff) | |
Merge branch 'fix-network-links' into 'master'
Fix Network graph links.
## What does this MR do?
Fixes the Network graph links so they no longer link to `/master#{escape_javascript(@commit_url)}`
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
Single quotes don't evaluate Ruby expressions.
## What are the relevant issue numbers?
Fixes #18894.
cc: @jschatz1
See merge request !4832
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/network/show.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index ad34c0928e1..6b101afe74a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,6 +10,7 @@ v 8.9.1 (unreleased) - Display group/project access requesters separately in the admin area. !4798 - Add documentation and examples for configuring cloud storage for registry images. !4812 - Clarifies documentation about artifact expiry. !4831 + - Fixes the Network graph links. !4832 - Fix MR-auto-close text added to description. !4836 - Fix typo in export failure email. !4847 diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index e4ab064eda8..593af319a47 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -15,5 +15,5 @@ = check_box_tag :filter_ref, 1, @options[:filter_ref] %span Begin with the selected commit - .network-graph{ data: { url: '#{escape_javascript(@url)}', commit_url: '#{escape_javascript(@commit_url)}', ref: '#{escape_javascript(@ref)}', commit_id: '#{escape_javascript(@commit.id)}' } } + .network-graph{ data: { url: @url, commit_url: @commit_url, ref: @ref, commit_id: @commit.id } } = spinner nil, true |