forked from osbridge/openconferenceware
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add User#take_associations_from to simplify merging two users in the …
…console.
- Loading branch information
1 parent
7c3a44d
commit c843f33
Showing
3 changed files
with
76 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,3 +85,15 @@ aaron: | |
incognito: | ||
created_at: <%= 1.days.ago.to_s :db %> | ||
complete_profile: false | ||
|
||
# An almost duplicate of user quentin | ||
quentin2: | ||
proposals: bigtable_session, couchdb_session | ||
email: "[email protected]" | ||
first_name: "Quentin" | ||
last_name: "Tarantino" | ||
created_at: <%= 2.days.ago.to_s :db %> | ||
complete_profile: true | ||
biography: | | ||
I'm called Quentin, French form of the Roman name Quintinus. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters