diff options
author | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-04-12 17:49:11 +0900 |
---|---|---|
committer | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-05-13 18:44:50 +0900 |
commit | 3a4c1c5c63f625e6e6075d384a85c67c3992ffb7 (patch) | |
tree | 44ee168201087808e9e085046011d60edd35a28f | |
parent | c0e3b39792cb7ad479af66c07685eb37e654ccb6 (diff) | |
download | gitlab-ce-3a4c1c5c63f625e6e6075d384a85c67c3992ffb7.tar.gz |
Enable to filter graph by ref
-rw-r--r-- | app/controllers/graph_controller.rb | 2 | ||||
-rw-r--r-- | app/models/network/graph.rb | 7 |
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 |