diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-29 16:10:52 +0000 |
| commit | 184ffeccb7f4579b481db9b7744aa9baed70562f (patch) | |
| tree | 67c023b029a699a1e727ef6becdc0832e82ea1c5 /app/models/track_thing.rb | |
| parent | e44c8b875fd4ad46b954ef9c31bdb6f0366dcb9e (diff) | |
| parent | 79b2f672aeae394a2c195d89b70bda27bb3201a4 (diff) | |
Merge branch 'feature/batch-requests' into rails-3-develop
Conflicts:
config/general.yml-example
spec/factories.rb
Diffstat (limited to 'app/models/track_thing.rb')
| -rw-r--r-- | app/models/track_thing.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index d5e1cdb75..d5dda7bb5 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -311,7 +311,7 @@ class TrackThing < ActiveRecord::Base end # When constructing a new track, use this to avoid duplicates / double posting - def TrackThing.find_by_existing_track(tracking_user, track) + def TrackThing.find_existing(tracking_user, track) if tracking_user.nil? return nil end |