summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-11 09:54:01 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-11 09:54:01 +0300
commit038d40f0f5b202fe9ed133fdf9de1774bdbc8ede (patch)
treea8ce15d3aac9307f76b116c73f5c8c4caa30ce7f /app/controllers
parent9e2c8d94766617358d39b81fe42f360e6dc469f8 (diff)
downloadgitlab-ce-038d40f0f5b202fe9ed133fdf9de1774bdbc8ede.tar.gz
Solve inconsistency between network graph & stat graphs
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/graphs_controller.rb (renamed from app/controllers/stat_graph_controller.rb)2
-rw-r--r--app/controllers/network_controller.rb (renamed from app/controllers/graph_controller.rb)2
-rw-r--r--app/controllers/refs_controller.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/stat_graph_controller.rb b/app/controllers/graphs_controller.rb
index f076f4726d0..5ae9c15c0f7 100644
--- a/app/controllers/stat_graph_controller.rb
+++ b/app/controllers/graphs_controller.rb
@@ -1,4 +1,4 @@
-class StatGraphController < ProjectResourceController
+class GraphsController < ProjectResourceController
# Authorize
before_filter :authorize_read_project!
before_filter :authorize_code_access!
diff --git a/app/controllers/graph_controller.rb b/app/controllers/network_controller.rb
index c79ed5ca3cc..3c8e747ba4e 100644
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/network_controller.rb
@@ -1,4 +1,4 @@
-class GraphController < ProjectResourceController
+class NetworkController < ProjectResourceController
include ExtractsPath
include ApplicationHelper
diff --git a/app/controllers/refs_controller.rb b/app/controllers/refs_controller.rb
index e7def3984f8..cae9193a1da 100644
--- a/app/controllers/refs_controller.rb
+++ b/app/controllers/refs_controller.rb
@@ -14,7 +14,7 @@ class RefsController < ProjectResourceController
elsif params[:destination] == "blob"
project_blob_path(@project, (@id))
elsif params[:destination] == "graph"
- project_graph_path(@project, @id, @options)
+ project_network_path(@project, @id, @options)
else
project_commits_path(@project, @id)
end