Commit 83cf1e08 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'revert-file-update-checker' into 'master'

Revert to non-evented file watcher

See merge request gitlab-org/gitlab!24167
parents cd8a697d d45309a9
...@@ -332,7 +332,6 @@ group :metrics do ...@@ -332,7 +332,6 @@ group :metrics do
end end
group :development do group :development do
gem 'listen', '~> 3.0'
gem 'brakeman', '~> 4.2', require: false gem 'brakeman', '~> 4.2', require: false
gem 'danger', '~> 6.0', require: false gem 'danger', '~> 6.0', require: false
......
...@@ -1279,7 +1279,6 @@ DEPENDENCIES ...@@ -1279,7 +1279,6 @@ DEPENDENCIES
license_finder (~> 5.4) license_finder (~> 5.4)
licensee (~> 8.9) licensee (~> 8.9)
liquid (~> 4.0) liquid (~> 4.0)
listen (~> 3.0)
lograge (~> 0.5) lograge (~> 0.5)
loofah (~> 2.2) loofah (~> 2.2)
lru_redux lru_redux
......
...@@ -50,8 +50,4 @@ Rails.application.configure do ...@@ -50,8 +50,4 @@ Rails.application.configure do
# BetterErrors live shell (REPL) on every stack frame # BetterErrors live shell (REPL) on every stack frame
BetterErrors::Middleware.allow_ip!("127.0.0.1/0") BetterErrors::Middleware.allow_ip!("127.0.0.1/0")
# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment