projects
/
rails.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into openid
[rails.git]
/
test
/
fixtures
/
user_roles.yml
diff --git
a/test/fixtures/user_roles.yml
b/test/fixtures/user_roles.yml
index fd568daf75945be098cd5ed7c54d9a914b10ab79..a5f81425547c3b4fe2ace25a8e3b017222d9ab29 100644
(file)
--- a/
test/fixtures/user_roles.yml
+++ b/
test/fixtures/user_roles.yml
@@
-3,7
+3,9
@@
administrator:
user_id: 6
role: administrator
administrator:
user_id: 6
role: administrator
+ granter_id: 6
moderator:
user_id: 5
role: moderator
moderator:
user_id: 5
role: moderator
+ granter_id: 6