summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2017-05-31 10:54:28 +0000
committerTimothy Andrew <mail@timothyandrew.net>2017-05-31 10:54:28 +0000
commitc3f68f9032b2548c4a5956f9e4b1a69306020faf (patch)
treeaf76b701d4b5b068d477ee4344d10bacd2d3b410
parent2c6fc0fff6204b20ea3cdd7b8c579692ac2b0ca5 (diff)
downloadgitlab-ce-c3f68f9032b2548c4a5956f9e4b1a69306020faf.tar.gz
Fix incorrect merge in 2c6fc0f.
Reference: 3c7c859c359bf5d3955dd300d6861ff33af21ca7
-rw-r--r--lib/gitlab/regex.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/regex.rb b/lib/gitlab/regex.rb
index f609850f8fa..34b6921d606 100644
--- a/lib/gitlab/regex.rb
+++ b/lib/gitlab/regex.rb
@@ -49,6 +49,7 @@ module Gitlab
sent_notifications
services
snippets
+ system
teams
u
unicorn_test