diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-24 19:23:37 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-24 19:23:37 +0200 |
| commit | bc0692d75b1eeb7bc439869d892da9b835b40e0d (patch) | |
| tree | 97094799e3c9234eefba49a068757c277e5e2628 /app | |
| parent | d23671b5fd910e1c59f52938789a8a3321724ef6 (diff) | |
Removing mini-profiler that doesn't work, formatting timelines a bit better
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/components/components/status.jsx | 7 | ||||
| -rw-r--r-- | app/controllers/application_controller.rb | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx index 9bbb02077..68c1efaad 100644 --- a/app/assets/javascripts/components/components/status.jsx +++ b/app/assets/javascripts/components/components/status.jsx @@ -6,11 +6,12 @@ const Status = React.createClass({ }, render: function() { - console.log(this.props.status.toJS()); + var content = { __html: this.props.status.get('content') }; return ( - <div style={{ height: '100px' }}> - {this.props.status.getIn(['account', 'username'])}: {this.props.status.get('content')} + <div style={{ padding: '5px' }}> + <div><strong>{this.props.status.getIn(['account', 'username'])}</strong></div> + <div dangerouslySetInnerHTML={content} /> </div> ); } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 399faa21e..73de1838c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,13 +5,6 @@ class ApplicationController < ActionController::Base force_ssl if: "Rails.env.production? && ENV['LOCAL_HTTPS'] == 'true'" - # Profiling - before_action do - if (current_user && current_user.admin?) || Rails.env.development? - Rack::MiniProfiler.authorize_request - end - end - helper_method :current_account protected |