diff options
| author | ZJ van de Weg <zegerjan@gitlab.com> | 2016-05-30 14:46:23 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-05-30 18:54:08 +0200 |
| commit | cbd7801b3d1d435a95ec70032c5acc9df33b0337 (patch) | |
| tree | 7bd367bf31690e4a6b0115d238cf2c312c9fb2ab /config/initializers | |
| parent | f99b38c9d5dab11677b2680a671c1a66fb69283b (diff) | |
| parent | 2485bd7bbf9686f993d2a417943feff5c7d5b6f3 (diff) | |
| download | gitlab-ce-cbd7801b3d1d435a95ec70032c5acc9df33b0337.tar.gz | |
Merge branch 'master' into awardables
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/metrics.rb | 1 | ||||
| -rw-r--r-- | config/initializers/premailer.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/metrics.rb b/config/initializers/metrics.rb index 2338916e9da..0c788714714 100644 --- a/config/initializers/metrics.rb +++ b/config/initializers/metrics.rb @@ -12,6 +12,7 @@ if Gitlab::Metrics.enabled? Gitlab::Application.configure do |config| config.middleware.use(Gitlab::Metrics::RackMiddleware) + config.middleware.use(Gitlab::Middleware::RailsQueueDuration) end Sidekiq.configure_server do |config| diff --git a/config/initializers/premailer.rb b/config/initializers/premailer.rb index b9176688bc4..cb00d3cfe95 100644 --- a/config/initializers/premailer.rb +++ b/config/initializers/premailer.rb @@ -3,6 +3,6 @@ Premailer::Rails.config.merge!( generate_text_part: false, preserve_styles: true, remove_comments: true, - remove_ids: true, + remove_ids: false, remove_scripts: false ) |