diff options
| author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
| commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
| tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /app/controllers/application_controller.rb | |
| parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 06b245a..62d9df2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -3,4 +3,16 @@ class ApplicationController < ActionController::Base ActiveSupport.run_load_hooks(:application_controller, self) + protected + + # + # Allows us to pass through bold text to flash messages. See format_flash() for where this is reversed. + # + # TODO: move to core + # + def bold(str) + "[b]#{str}[/b]" + end + helper_method :bold + end |