diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-16 23:13:55 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-16 23:13:55 +0300 |
| commit | 6b824cc2b0eae589073628dd945f468bcd2576a3 (patch) | |
| tree | 8ba376102eb1f924781b2d6a3359482a0f4ce683 /config | |
| parent | 27a6d65c616b58fdce5d7eba7a11b7ef7b2c8d28 (diff) | |
| parent | b236348388c46c0550ec6844df35ec2689c4060b (diff) | |
Merge branch 'master' into 'refactor-jobs-show-haml'
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index c914e34b9c3..918bd4d57cf 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,6 +69,7 @@ module Gitlab # - Webhook URLs (:hook) # - Sentry DSN (:sentry_dsn) # - Deploy keys (:key) + # - Secret variable values (:value) config.filter_parameters += [/token$/, /password/, /secret/] config.filter_parameters += %i( certificate @@ -80,6 +81,7 @@ module Gitlab sentry_dsn trace variables + value ) # Enable escaping HTML in JSON. diff --git a/config/webpack.config.js b/config/webpack.config.js index edf5256aadc..163f231f131 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -77,12 +77,9 @@ var config = { notes: './notes/index.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', - pipelines_charts: './pipelines/pipelines_charts.js', pipelines_details: './pipelines/pipeline_details_bundle.js', - pipelines_times: './pipelines/pipelines_times.js', profile: './profile/profile_bundle.js', project_import_gl: './projects/project_import_gitlab_project.js', - prometheus_metrics: './prometheus_metrics', protected_branches: './protected_branches', protected_tags: './protected_tags', registry_list: './registry/index.js', @@ -98,7 +95,6 @@ var config = { vue_merge_request_widget: './vue_merge_request_widget/index.js', test: './test.js', two_factor_auth: './two_factor_auth.js', - users: './users/index.js', webpack_runtime: './webpack.js', }, |