Download as
Browse Code »

Commit 8c1e8d15ad4f8b8d69ba2465a0e722722bd0c519

Authored by Leandro Santos
Committed by Rodrigo Souto
1 parent addf3a33
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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 @8c1e8d1
@@ -100,12 +100,12 @@ class Profile < ActiveRecord::Base @@ -100,12 +100,12 @@ class Profile < ActiveRecord::Base
100 scope :no_templates, {:conditions => {:is_template => false}} 100 scope :no_templates, {:conditions => {:is_template => false}}
101 101
102 #FIXME make this test 102 #FIXME make this test
103 - named_scope :newer_than, lambda { |reference_id| 103 + scope :newer_than, lambda { |reference_id|
104 {:conditions => ["profiles.id > #{reference_id}"]} 104 {:conditions => ["profiles.id > #{reference_id}"]}
105 } 105 }
106 106
107 #FIXME make this test 107 #FIXME make this test
108 - named_scope :older_than, lambda { |reference_id| 108 + scope :older_than, lambda { |reference_id|
109 {:conditions => ["profiles.id < #{reference_id}"]} 109 {:conditions => ["profiles.id < #{reference_id}"]}
110 } 110 }
111 111
test/unit/person_test.rb
  Diff comments   View file @8c1e8d1
@@ -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)