summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-10-14 08:11:25 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-10-14 08:11:25 -0700
commitd0146881f0a541c609f8d90d134ffc384a2b6d74 (patch)
tree4f7d0913ad918523874ccc90978031774b84c2ff
parentfced9678eae29864a1062a3d977cc611790a1a69 (diff)
parent757b4bbc5c8f08d8e48e3c98a513570d4b4016d7 (diff)
downloadgitlab-ce-d0146881f0a541c609f8d90d134ffc384a2b6d74.tar.gz
Merge pull request #1693 from SaitoWu/features/mr
Improve development experience.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock4
-rw-r--r--config/initializers/quite_assets.rb13
3 files changed, 18 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 954fb888371..aacbb8f39dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -118,6 +118,7 @@ group :development do
end
group :development, :test do
+ gem 'rails-dev-tweaks'
gem 'spinach-rails'
gem "rspec-rails"
gem "capybara"
diff --git a/Gemfile.lock b/Gemfile.lock
index 87fd1c90868..ecc25a05100 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -277,6 +277,9 @@ GEM
activesupport (= 3.2.8)
bundler (~> 1.0)
railties (= 3.2.8)
+ rails-dev-tweaks (0.6.1)
+ actionpack (~> 3.1)
+ railties (~> 3.1)
railties (3.2.8)
actionpack (= 3.2.8)
activesupport (= 3.2.8)
@@ -447,6 +450,7 @@ DEPENDENCIES
pygments.rb (= 0.3.1)
rack-mini-profiler
rails (= 3.2.8)
+ rails-dev-tweaks
raphael-rails (= 1.5.2)
rb-fsevent
rb-inotify
diff --git a/config/initializers/quite_assets.rb b/config/initializers/quite_assets.rb
new file mode 100644
index 00000000000..6fed1803ae1
--- /dev/null
+++ b/config/initializers/quite_assets.rb
@@ -0,0 +1,13 @@
+if Rails.env.development?
+ Rails.application.assets.logger = Logger.new('/dev/null')
+ Rails::Rack::Logger.class_eval do
+ def call_with_quiet_assets(env)
+ previous_level = Rails.logger.level
+ Rails.logger.level = Logger::ERROR if env['PATH_INFO'] =~ %r{^/assets/}
+ call_without_quiet_assets(env)
+ ensure
+ Rails.logger.level = previous_level
+ end
+ alias_method_chain :call, :quiet_assets
+ end
+end