From 6505c02ea36919f3ed9f3da78b305ed5c6f9dd4f Mon Sep 17 00:00:00 2001 From: Leandro Nunes dos Santos Date: Tue, 24 Mar 2015 20:39:16 -0300 Subject: [PATCH] api: fixing conflit on merge --- app/models/profile.rb | 4 ++-- test/unit/person_test.rb | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/profile.rb b/app/models/profile.rb index 9d9f695..d366510 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -89,12 +89,12 @@ class Profile < ActiveRecord::Base scope :no_templates, {:conditions => {:is_template => false}} #FIXME make this test - named_scope :newer_than, lambda { |reference_id| + scope :newer_than, lambda { |reference_id| {:conditions => ["profiles.id > #{reference_id}"]} } #FIXME make this test - named_scope :older_than, lambda { |reference_id| + scope :older_than, lambda { |reference_id| {:conditions => ["profiles.id < #{reference_id}"]} } diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb index 3603a72..dcc57d3 100644 --- a/test/unit/person_test.rb +++ b/test/unit/person_test.rb @@ -1524,7 +1524,6 @@ class PersonTest < ActiveSupport::TestCase end end -<<<<<<< HEAD should 'have a list of suggested people to be friend' do person = create_user('person').person suggested_friend = fast_create(Person) -- libgit2 0.21.2