Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4

# Conflicts:
#	.gitlab-ci.yml

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 28aee2e3799..34efcd0088d 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -91,7 +91,7 @@ class Member < ActiveRecord::Base
         member.invite_email = user
       end
 
-      if can_update_member?(current_user, member)
+      if can_update_member?(current_user, member) || project_creator?(member, access_level)
         member.created_by ||= current_user
         member.access_level = access_level
 
@@ -107,6 +107,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?