summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-11 17:58:08 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-11 17:58:08 +0000
commit5eec504cd099e4298e743c99a31e64ab00239107 (patch)
tree62e39bf15ceafda2f3a4f10fd0b30f9fbf63112f /config
parentf8ebe264ee725a3d98bf04ef8c7a1f22cfd55907 (diff)
parent9993a749d0e9f753aa7ecd4590260c1730c319a1 (diff)
downloadgitlab-ci-5eec504cd099e4298e743c99a31e64ab00239107.tar.gz
Merge branch 'brakeman' into 'master'
Adding brakeman Fixes #163 See merge request !136
Diffstat (limited to 'config')
-rw-r--r--config/application.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb
index ba0da4b..e2cea6b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -45,14 +45,12 @@ module GitlabCi
# This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible
# parameters by using an attr_accessible or attr_protected declaration.
- config.active_record.whitelist_attributes = true
+ config.active_record.whitelist_attributes = false
# Enable the asset pipeline
config.assets.enabled = true
# Version of your assets, change this if you want to expire all your assets
config.assets.version = '1.0'
-
- config.active_record.whitelist_attributes = false
end
end