Switchable the main branch on network graph
This commit is contained in:
parent
c84675ee06
commit
525a8cd3e9
9 changed files with 43 additions and 22 deletions
18
app/controllers/graph_controller.rb
Normal file
18
app/controllers/graph_controller.rb
Normal file
|
@ -0,0 +1,18 @@
|
|||
class GraphController < ProjectResourceController
|
||||
include ExtractsPath
|
||||
|
||||
# Authorize
|
||||
before_filter :authorize_read_project!
|
||||
before_filter :authorize_code_access!
|
||||
before_filter :require_non_empty_project
|
||||
|
||||
def show
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json do
|
||||
graph = Gitlab::Graph::JsonBuilder.new(project, @ref)
|
||||
render :json => graph.to_json
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
|
@ -90,16 +90,6 @@ class ProjectsController < ProjectResourceController
|
|||
end
|
||||
end
|
||||
|
||||
def graph
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.json do
|
||||
graph = Gitlab::Graph::JsonBuilder.new(project)
|
||||
render :json => graph.to_json
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
return access_denied! unless can?(current_user, :remove_project, project)
|
||||
|
||||
|
|
|
@ -13,6 +13,8 @@ class RefsController < ProjectResourceController
|
|||
format.html do
|
||||
new_path = if params[:destination] == "tree"
|
||||
project_tree_path(@project, (@ref + "/" + params[:path]))
|
||||
elsif params[:destination] == "graph"
|
||||
project_graph_path(@project, @ref)
|
||||
else
|
||||
project_commits_path(@project, @ref)
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue