Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-06-22 04:18:45 +0300
committerRémy Coutable <remy@rymai.me>2016-06-22 16:55:33 +0300
commitad1158837ef6028a4b43550cd264f7f80284d019 (patch)
tree377e9a2707ceb873d596279b5d1382410aa7f638 /app
parent1e34a81cd445fce7d236821764ac6e8c474dff2c (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>
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/network/show.html.haml2
1 files changed, 1 insertions, 1 deletions
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