Creator should be added as a master of the project on creationfix-project-creation

This also enable a project creator to add themselves as a master of the
project.

2 files changed, 9 insertions, 2 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 28aee2e3799..c1138b80b4a 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -91,7 +91,9 @@ class Member < ActiveRecord::Base
         member.invite_email = user
       end
 
-      if can_update_member?(current_user, member)
+      can_update = can_update_member?(current_user, member) || project_creator?(member, access_level)
+
+      if can_update
         member.created_by ||= current_user
         member.access_level = access_level
 
@@ -107,6 +109,11 @@ class Member < ActiveRecord::Base
         current_user.can?(:update_group_member, member) ||
         current_user.can?(:update_project_member, member)
     end
+
+    def project_creator?(member, access_level)
+      member.new_record? && member.owner? &&
+        access_level.to_i == ProjectMember::MASTER
+    end
   end
 
   def invite?
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb
index c94d7ab710f..a6820183bee 100644
--- a/app/services/projects/create_service.rb
+++ b/app/services/projects/create_service.rb
@@ -95,7 +95,7 @@ module Projects
       system_hook_service.execute_hooks_for(@project, :create)
 
       unless @project.group
-        @project.team << [current_user, :master]
+        @project.team << [current_user, :master, current_user]
       end
 
       @project.import_start if @project.import?