From 685757b9d6c1c137c479288fe640c9440a785d71 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytses@gmail.com>
Date: Tue, 9 Sep 2014 10:11:07 +0200
Subject: [PATCH] Prevent people from using ci since we plan to host ci on /ci
 later.

---
 CHANGELOG               | 1 +
 lib/gitlab/blacklist.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 814c1d4d0e..5dd865e474 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 7.3.0
   - Create annotated tags through UI and API (Sean Edge)
   - Snippets search (Charles Bushong)
   - Comment new push to existing MR
+  - Add 'ci' to the blacklist of forbidden names
   - Improve text filtering on issues page
   - Comment & Close button
   - Process git push --all much faster
diff --git a/lib/gitlab/blacklist.rb b/lib/gitlab/blacklist.rb
index 65efb6e440..43145e0ee1 100644
--- a/lib/gitlab/blacklist.rb
+++ b/lib/gitlab/blacklist.rb
@@ -27,6 +27,7 @@ module Gitlab
         notes
         unsubscribes
         all
+        ci
       )
     end
   end