summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-23 00:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-23 00:09:14 +0000
commit9c71f76e2b49c070c35cb209fe3729e01a7ce92c (patch)
treef48aa6258fc5af462df9f20df28531fdfbfd20ae /config
parented45528885b7b44c61f18175fe7cdbda12360669 (diff)
downloadgitlab-ce-9c71f76e2b49c070c35cb209fe3729e01a7ce92c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/initializers/0_inflections.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/0_inflections.rb b/config/initializers/0_inflections.rb
index 5c38859a667..1fabce9a57e 100644
--- a/config/initializers/0_inflections.rb
+++ b/config/initializers/0_inflections.rb
@@ -28,4 +28,5 @@ ActiveSupport::Inflector.inflections do |inflect|
vulnerability_feedback
)
inflect.acronym 'EE'
+ inflect.acronym 'CSP'
end