Enable to filter graph by ref

2 files changed, 6 insertions, 3 deletions

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 22544ad82aa..c79ed5ca3cc 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -16,7 +16,7 @@ class GraphController < ProjectResourceController
       format.html
 
       format.json do
-        @graph = Network::Graph.new(project, @ref, @commit)
+        @graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
       end
     end
   end
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 27072836cbb..ffec4712e45 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -8,10 +8,11 @@ module Network
       @max_count ||= 650
     end
 
-    def initialize project, ref, commit
+    def initialize project, ref, commit, filter_ref
       @project = project
       @ref = ref
       @commit = commit
+      @filter_ref = filter_ref
       @repo = project.repo
 
       @commits = collect_commits
@@ -107,7 +108,9 @@ module Network
         skip: skip
       }
 
-      Grit::Commit.find_all(@repo, nil, opts)
+      ref = @ref if @filter_ref
+
+      Grit::Commit.find_all(@repo, ref, opts)
     end
 
     def commits_sort_by_ref