summaryrefslogtreecommitdiff
path: root/app/models/users_project.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-06 16:51:28 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-06 16:51:28 -0400
commitbde19c061a73a7756cad4ba02e52187b1eb22fc5 (patch)
tree5a0f6f948e7060d6254d3959b9d036232054737b /app/models/users_project.rb
parenta595f8944a32fa99ffd85a9c837a76a8dfc0ff7e (diff)
downloadgitlab-ce-bde19c061a73a7756cad4ba02e52187b1eb22fc5.tar.gz
Update failure message for UsersProject uniqueness validation
Was "User has already been taken", is now "User already exists in project".
Diffstat (limited to 'app/models/users_project.rb')
-rw-r--r--app/models/users_project.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 7d1729343bb..1b5984834e4 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -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
@@ -48,10 +48,10 @@ class UsersProject < ActiveRecord::Base
def self.access_roles
{
- "Guest" => GUEST,
- "Reporter" => REPORTER,
+ "Guest" => GUEST,
+ "Reporter" => REPORTER,
"Developer" => DEVELOPER,
- "Master" => MASTER
+ "Master" => MASTER
}
end