deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-12 19:02:05 +02:00
commit ddea7d1689
6 changed files with 91 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/graph_controller.rb
View file

@ -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