diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:40:04 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-02-15 17:59:06 +1100 |
| commit | a0f250204a376ce97a187cf8a9b2cb0b8c628298 (patch) | |
| tree | 812504a7b8da2431b3fed6f38f6796cdbbc84e00 /app/models/user.rb | |
| parent | 8f1caab7990dc417e32b14cbb5f00c34a0ddc10c (diff) | |
| parent | d16f2f8242352a2d3c0350275110453dd6ac6b12 (diff) | |
Merge branch 'develop' into rails-3-spike
Conflicts:
Gemfile
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/track_controller.rb
app/models/outgoing_message.rb
app/models/public_body.rb
app/models/user.rb
app/views/general/frontpage.rhtml
config/environment.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
db/migrate/094_remove_old_tags_foreign_key.rb
lib/timezone_fixes.rb
spec/models/request_mailer_spec.rb
spec/views/request/list.rhtml_spec.rb
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index bc04b5449..d16a9452a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -341,12 +341,13 @@ class User < ActiveRecord::Base end # Return about me text for display as HTML + # TODO: Move this to a view helper def get_about_me_for_html_display text = self.about_me.strip text = CGI.escapeHTML(text) text = MySociety::Format.make_clickable(text, :contract => 1) text = text.gsub(/\n/, '<br>') - return text + return text.html_safe end def json_for_api |