Merge branch 'feature/leave_project' of /home/git/repositories/gitlab/gitlabhq

1 files changed, 10 insertions, 1 deletions

diff --git a/app/controllers/projects/team_members_controller.rb b/app/controllers/projects/team_members_controller.rb
index b4b318fa59e..2c40b3c75f2 100644
--- a/app/controllers/projects/team_members_controller.rb
+++ b/app/controllers/projects/team_members_controller.rb
@@ -1,6 +1,6 @@
 class Projects::TeamMembersController < Projects::ApplicationController
   # Authorize
-  before_filter :authorize_admin_project!
+  before_filter :authorize_admin_project!, except: :leave
 
   layout "project_settings"
 
@@ -45,6 +45,15 @@ class Projects::TeamMembersController < Projects::ApplicationController
     end
   end
 
+  def leave
+    project.users_projects.find_by_user_id(current_user).destroy
+
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { render nothing: true }
+    end
+  end
+
   def apply_import
     giver = Project.find(params[:source_project_id])
     status = @project.team.import(giver)