deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into project_users_api

Browse source
This commit is contained in:
miks 2012-09-08 10:50:24 +03:00
commit 4226458faf
927 changed files with 1015 additions and 797 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/users_project.rb
View file

@ -14,7 +14,7 @@ class UsersProject < ActiveRecord::Base
after_save :update_repository
after_destroy :update_repository
validates_uniqueness_of :user_id, scope: [:project_id]
validates_uniqueness_of :user_id, scope: [:project_id], message: "already exists in project"
validates_presence_of :user_id
validates_presence_of :project_id
@ -65,10 +65,10 @@ class UsersProject < ActiveRecord::Base
def self.access_roles
{
"Guest" => GUEST,
"Reporter" => REPORTER,
"Guest" => GUEST,
"Reporter" => REPORTER,
"Developer" => DEVELOPER,
"Master" => MASTER
"Master" => MASTER
}
end