diff options
author | Robert Speicher <robert@gitlab.com> | 2016-02-09 21:34:46 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-02-09 21:34:46 +0000 |
commit | 4317b22741e0ffe7f3e6fe5227889cf85ccd7121 (patch) | |
tree | d9523ba88c4a72dbc81bab6a91abaf60c9d34c7a /config | |
parent | 94feb4da9d993199864d695126bb89d069a9f072 (diff) | |
parent | 078ec5e414bde2d8014d40cd476917d75d4756ac (diff) | |
download | gitlab-ce-4317b22741e0ffe7f3e6fe5227889cf85ccd7121.tar.gz |
Merge branch 'variables-build-log' into 'master'
Add notice about variables in build log
Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942
[ci skip]
See merge request !2761
Diffstat (limited to 'config')
-rw-r--r-- | config/application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index d255ff0719f..33d7b881fa4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -31,7 +31,7 @@ module Gitlab config.encoding = "utf-8" # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt) + config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt, :variables) # Enable escaping HTML in JSON. config.active_support.escape_html_entities_in_json = true |