Download as
Browse Code »

Commit 6505c02ea36919f3ed9f3da78b305ed5c6f9dd4f

Authored by Leandro Santos
1 parent b171a139
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

api: fixing conflit on merge

Showing 2 changed files with 2 additions and 3 deletions   Show diff stats
app/models/profile.rb
  Diff comments   View file @6505c02
@@ -89,12 +89,12 @@ class Profile < ActiveRecord::Base @@ -89,12 +89,12 @@ class Profile < ActiveRecord::Base
89 scope :no_templates, {:conditions => {:is_template => false}} 89 scope :no_templates, {:conditions => {:is_template => false}}
90 90
91 #FIXME make this test 91 #FIXME make this test
92 - named_scope :newer_than, lambda { |reference_id| 92 + scope :newer_than, lambda { |reference_id|
93 {:conditions => ["profiles.id > #{reference_id}"]} 93 {:conditions => ["profiles.id > #{reference_id}"]}
94 } 94 }
95 95
96 #FIXME make this test 96 #FIXME make this test
97 - named_scope :older_than, lambda { |reference_id| 97 + scope :older_than, lambda { |reference_id|
98 {:conditions => ["profiles.id < #{reference_id}"]} 98 {:conditions => ["profiles.id < #{reference_id}"]}
99 } 99 }
100 100
test/unit/person_test.rb
  Diff comments   View file @6505c02
@@ -1524,7 +1524,6 @@ class PersonTest &lt; ActiveSupport::TestCase @@ -1524,7 +1524,6 @@ class PersonTest &lt; ActiveSupport::TestCase
1524 end 1524 end
1525 end 1525 end
1526 1526
1527 -<<<<<<< HEAD  
1528 should 'have a list of suggested people to be friend' do 1527 should 'have a list of suggested people to be friend' do
1529 person = create_user('person').person 1528 person = create_user('person').person
1530 suggested_friend = fast_create(Person) 1529 suggested_friend = fast_create(Person)