diff options
author | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2013-03-06 17:11:47 -0800 |
commit | fc770ee6eb342d4562b6588612f1c9aca46f58e1 (patch) | |
tree | 8833be60c0f0cb39d33dbaf4538ceca8d848e57f /app/models/track_thing.rb | |
parent | 455a1f07f3099d1d94fff2a7efcf99fb8fd6841d (diff) | |
parent | 7abb45b0549af892b7f1ec2beeca5a42f8c2ef7a (diff) |
Merge remote-tracking branch 'openaustralia_github/make-links-relative' into develop
Conflicts:
app/controllers/admin_request_controller.rb
app/models/request_mailer.rb
app/views/admin_general/index.rhtml
app/views/admin_general/stats.rhtml
app/views/admin_public_body/_one_list.rhtml
app/views/admin_public_body/_tags.rhtml
app/views/admin_public_body/show.rhtml
app/views/admin_request/show.rhtml
app/views/admin_user/show.rhtml
app/views/layouts/admin.rhtml
app/views/public_body/show.rhtml
app/views/request/new.rhtml
Diffstat (limited to 'app/models/track_thing.rb')
-rw-r--r-- | app/models/track_thing.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index dfe92b7fe..a0c74bdb6 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -23,6 +23,8 @@ require 'set' +# TODO: TrackThing looks like a good candidate for single table inheritance + class TrackThing < ActiveRecord::Base belongs_to :tracking_user, :class_name => 'User' validates_presence_of :track_query |