diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/environments/test.rb | 3 | ||||
-rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/environments/test.rb b/config/environments/test.rb index fb25d3a8b14..a25c5016a3b 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,4 +1,7 @@ Rails.application.configure do + # Make sure the middleware is inserted first in middleware chain + config.middleware.insert_before('ActionDispatch::Static', 'Gitlab::Testing::RequestBlockerMiddleware') + # Settings specified here will take precedence over those in config/application.rb # The test environment is used exclusively to run your application's diff --git a/config/webpack.config.js b/config/webpack.config.js index 3cf94b9b435..0859c8416c8 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -21,7 +21,7 @@ var config = { common_vue: ['vue', './vue_shared/common_vue.js'], common_d3: ['d3'], main: './main.js', - blob_edit: './blob_edit/blob_edit_bundle.js', + blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', simulate_drag: './test_utils/simulate_drag.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', |