Browse Source

Removing mini-profiler that doesn't work, formatting timelines a bit better

pull/4/head
Eugen Rochko 6 years ago
parent
commit
bc0692d75b
6 changed files with 4 additions and 28 deletions
  1. +0
    -4
      .travis.yml
  2. +0
    -5
      Gemfile
  3. +0
    -5
      Gemfile.lock
  4. +4
    -3
      app/assets/javascripts/components/components/status.jsx
  5. +0
    -7
      app/controllers/application_controller.rb
  6. +0
    -4
      config/initializers/rack-mini-profiler.rb

+ 0
- 4
.travis.yml View File

@ -18,10 +18,6 @@ services:
bundler_args: --without development production --retry=3 --jobs=3
before_install:
- sudo apt-get -qq update
- sudo apt-get install -y nodejs nodejs-legacy npm
before_script:
- npm install
- bundle exec rake db:create db:migrate

+ 0
- 5
Gemfile View File

@ -60,13 +60,8 @@ group :development do
gem 'binding_of_caller'
gem 'letter_opener'
gem 'bullet'
gem 'memory_profiler'
end
group :production do
gem 'rails_12factor'
end
group :development, :production do
gem 'rack-mini-profiler'
end

+ 0
- 5
Gemfile.lock View File

@ -162,7 +162,6 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
memory_profiler (0.9.6)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
@ -214,8 +213,6 @@ GEM
rack (2.0.1)
rack-attack (5.0.1)
rack
rack-mini-profiler (0.10.1)
rack (>= 1.2.0)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.0.1)
@ -380,7 +377,6 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
letter_opener
memory_profiler
nokogiri
oj
onebox
@ -391,7 +387,6 @@ DEPENDENCIES
puma
rabl
rack-attack
rack-mini-profiler
rails (= 5.0.0.1)
rails_12factor
rails_autolink

+ 4
- 3
app/assets/javascripts/components/components/status.jsx View File

@ -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>
);
}

+ 0
- 7
app/controllers/application_controller.rb View File

@ -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

+ 0
- 4
config/initializers/rack-mini-profiler.rb View File

@ -1,4 +0,0 @@
unless Rails.env == 'test'
Rails.application.middleware.swap(Rack::Deflater, Rack::MiniProfiler)
Rails.application.middleware.swap(Rack::MiniProfiler, Rack::Deflater)
end

Loading…
Cancel
Save