From cc0295b789a89a3f52e83e34b08ddf17b464308a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 5 Dec 2012 06:14:05 +0300
Subject: Only owner can remove project

---
 app/controllers/projects_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a6e7f1f93fb..272a6e95411 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -89,6 +89,8 @@ class ProjectsController < ProjectResourceController
   end
 
   def destroy
+    return access_denied! unless can?(current_user, :remove_project, project)
+
     # Disable the UsersProject update_repository call, otherwise it will be
     # called once for every person removed from the project
     UsersProject.skip_callback(:destroy, :after, :update_repository)
-- 
cgit v1.2.1


From e1282d507f1a0321c4f25815470b0fa05265e6dd Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Fri, 7 Dec 2012 19:06:46 +0100
Subject: BranchGraph now loads async Centralized keyboard and drag events for
 BranchGraph

---
 app/controllers/projects_controller.rb | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 272a6e95411..b6213001a0d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -83,9 +83,19 @@ class ProjectsController < ProjectResourceController
   end
 
   def graph
-    graph = Gitlab::Graph::JsonBuilder.new(project)
+    
+    respond_to do |format|
+      format.html
+      format.json do
+        graph = Gitlab::Graph::JsonBuilder.new(project)
+        #@days_json, @commits_json = graph.days_json, graph.commits_json
+        render :text => graph.to_json
+      end
+    end
+    
+    
 
-    @days_json, @commits_json = graph.days_json, graph.commits_json
+    
   end
 
   def destroy
-- 
cgit v1.2.1


From 4b2ecbc420ca10ad78e0e6f921d6740c84f2574a Mon Sep 17 00:00:00 2001
From: Koen Punt <koen@koenpunt.nl>
Date: Fri, 7 Dec 2012 22:05:17 +0100
Subject: Updated branch-graph, abstracted some code in seperate functions
 Removed unused Raphael.fn.popup

---
 app/controllers/projects_controller.rb | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b6213001a0d..d6c6a1bdbd7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -54,12 +54,12 @@ class ProjectsController < ProjectResourceController
 
     respond_to do |format|
       format.html do
-         unless @project.empty_repo?
-           @last_push = current_user.recent_push(@project.id)
-           render :show
-         else
-           render "projects/empty"
-         end
+        unless @project.empty_repo?
+          @last_push = current_user.recent_push(@project.id)
+          render :show
+        else
+          render "projects/empty"
+        end
       end
       format.js
     end
@@ -83,19 +83,13 @@ class ProjectsController < ProjectResourceController
   end
 
   def graph
-    
     respond_to do |format|
       format.html
       format.json do
         graph = Gitlab::Graph::JsonBuilder.new(project)
-        #@days_json, @commits_json = graph.days_json, graph.commits_json
-        render :text => graph.to_json
+        render :json => graph.to_json
       end
     end
-    
-    
-
-    
   end
 
   def destroy
-- 
cgit v1.2.1


From 1d156c9c8ee0d81370844d58c2863cb4b780489e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 13 Dec 2012 18:42:15 +0200
Subject: Fix project lookup. Show error if project transfer fails

---
 app/controllers/projects_controller.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'app/controllers/projects_controller.rb')

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 272a6e95411..985dcfe8ea9 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -46,6 +46,10 @@ class ProjectsController < ProjectResourceController
         format.js
       end
     end
+
+  rescue Project::TransferError => ex
+    @error = ex
+    render :update_failed
   end
 
   def show
-- 
cgit v1.2.1