diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-26 19:06:42 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-26 19:06:42 +0100 |
| commit | 8c122d65bfed5c5addd3245304895b98f8b83b36 (patch) | |
| tree | 430ac6f1b2c30d0e0b8f0c6efa494918850e6004 /config | |
| parent | fd598fd6bda91343d7e271c0fe485ead9e0011d2 (diff) | |
| parent | 1553a34dbff167978f5dc81cc3a21e0b3b2b2bfa (diff) | |
| download | gitlab-ce-8c122d65bfed5c5addd3245304895b98f8b83b36.tar.gz | |
Resolved conflicts in app/assets/javascripts/pages/projects/settings/repository/show/index.js
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 0f164e628f9..161fb185c9b 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -10,7 +10,7 @@ Sidekiq.configure_server do |config| config.server_middleware do |chain| chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS'] - chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'] + chain.add Gitlab::SidekiqMiddleware::Shutdown chain.add Gitlab::SidekiqMiddleware::RequestStoreMiddleware unless ENV['SIDEKIQ_REQUEST_STORE'] == '0' chain.add Gitlab::SidekiqStatus::ServerMiddleware end diff --git a/config/webpack.config.js b/config/webpack.config.js index 7f3b279b062..6fee0b5128b 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -51,11 +51,10 @@ var config = { context: path.join(ROOT_PATH, 'app/assets/javascripts'), entry: { balsamiq_viewer: './blob/balsamiq_viewer.js', - blob: './blob_edit/blob_bundle.js', - boards: './boards/boards_bundle.js', + common: './commons/index.js', + common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', - deploy_keys: './deploy_keys/index.js', diff_notes: './diff_notes/diff_notes_bundle.js', environments: './environments/environments_bundle.js', environments_folder: './environments/folder/environments_folder_bundle.js', |