Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph

1 files changed, 11 insertions, 1 deletions

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 30ec5e89db2..c370433e500 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -7,10 +7,20 @@ class GraphController < ProjectResourceController
   before_filter :require_non_empty_project
 
   def show
+    if params.has_key?(:q) && params[:q].blank?
+      redirect_to project_graph_path(@project, params[:id])
+      return
+    end
+
+    if params.has_key?(:q)
+      @q = params[:q]
+      @commit = @project.repository.commit(@q) || @commit
+    end
+
     respond_to do |format|
       format.html
       format.json do
-        graph = Gitlab::Graph::JsonBuilder.new(project, @ref)
+        graph = Gitlab::Graph::JsonBuilder.new(project, @ref, @commit)
         render :json => graph.to_json
       end
     end