Merge pull request #2435 from vcuculo/master
Fix typo + Show diaspora_handle on profile [mobile]
This commit is contained in:
commit
a91c7faffe
2 changed files with 3 additions and 1 deletions
|
|
@ -10,6 +10,8 @@
|
|||
= person_image_tag @person, :thumb_medium
|
||||
%h2
|
||||
= @person.name
|
||||
%span.description
|
||||
= @person.diaspora_handle
|
||||
|
||||
- if user_signed_in? && !(@contact.persisted? || current_user.person == @person)
|
||||
- if @incoming_request
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
if AppConfig[:featured_users].present? && AppConfig[:community_spotlight].blank?
|
||||
AppConfig[:community_spotlight] = AppConfig[:featured_users]
|
||||
puts "DEPRICATION WARNING (10/21/11): Please change `featured_users` in your applicaiton.yml to `community_spotlight`. Thanks!"
|
||||
puts "DEPRICATION WARNING (10/21/11): Please change `featured_users` in your application.yml to `community_spotlight`. Thanks!"
|
||||
end
|
||||
|
||||
unless !ActiveRecord::Base.connection.table_exists?('people') || Rails.env == 'test' || AppConfig[:community_spotlight].nil? || AppConfig[:community_spotlight].count == Person.community_spotlight.count
|
||||
|
|
|
|||
Loading…
Reference in a new issue