Skip to content

Commit

Permalink
modified: .idea/misc.xml
Browse files Browse the repository at this point in the history
modified:   .idea/.generators
new file:   .idea/codeStyleSettings.xml
modified:   .idea/dictionaries/n6330274.xml
-- added style settings, custom words

modified:   app/models/user.rb
-- added relations to users
  • Loading branch information
atruskie committed Oct 31, 2012
1 parent b57d3fd commit a0ac774
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .idea/.generators

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/dictionaries/n6330274.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,12 @@ class User < ActiveRecord::Base
# user stamp
model_stamper
stampable


# other associations
has_many :projects
has_many :sites
has_many :audio_recordings
has_many :audio_events

end

0 comments on commit a0ac774

Please sign in to comment.