diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:37:46 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-23 12:37:46 +0000 |
| commit | f9119150ec98a62c27345f8ecef1824de6b24d35 (patch) | |
| tree | bd13ad0160cfdfe1b00a06b11059c0f1b410fcde | |
| parent | 285ae60c15c913aa6145554ecbddf9b966ebd0e7 (diff) | |
| parent | 6c3591279f394a4f23eda42a7db09bc09cad8f10 (diff) | |
| download | gitlab-ce-f9119150ec98a62c27345f8ecef1824de6b24d35.tar.gz | |
Merge branch 'rs-rails-env-predicates' into 'master'
Fix two places where we should be using `Rails.env.development?`
See merge request !550
| -rw-r--r-- | app/views/layouts/_head.html.haml | 2 | ||||
| -rw-r--r-- | config/initializers/6_rack_profiler.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/_head.html.haml b/app/views/layouts/_head.html.haml index 78d6d08ee1f..5a6ae09a506 100644 --- a/app/views/layouts/_head.html.haml +++ b/app/views/layouts/_head.html.haml @@ -16,7 +16,7 @@ = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id') = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id') - = render 'layouts/bootlint' if Rails.env == 'development' + = render 'layouts/bootlint' if Rails.env.development? -# Atom feed - if current_user diff --git a/config/initializers/6_rack_profiler.rb b/config/initializers/6_rack_profiler.rb index b6340287569..bdad6202b11 100644 --- a/config/initializers/6_rack_profiler.rb +++ b/config/initializers/6_rack_profiler.rb @@ -1,4 +1,4 @@ -if Rails.env == 'development' +if Rails.env.development? require 'rack-mini-profiler' # initialization is skipped so trigger it |