diff options
| author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-13 10:31:06 +0100 |
|---|---|---|
| committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-13 10:31:06 +0100 |
| commit | 375caeefcfb2672c8fdce18cf6f35372729d0c43 (patch) | |
| tree | 74b90868c88f9641a0975271f8a5620709f90eb9 /app/controllers/graph_controller.rb | |
| parent | ae40e855efc393d752f290ed8eda67961874acf5 (diff) | |
| parent | b9f8b4019073fe60515bda8947d9040b4b73ea38 (diff) | |
| download | gitlab-ce-375caeefcfb2672c8fdce18cf6f35372729d0c43.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'app/controllers/graph_controller.rb')
| -rw-r--r-- | app/controllers/graph_controller.rb | 12 |
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 |