Merge branch 'add-ci-to-blacklist' into 'master'

Add ci to blacklist See merge request !1075

Merge branch 'add-ci-to-blacklist' into 'master'
Add ci to blacklist See merge request !1075
0cff6df0 · Dmitriy Zaporozhets · 29e7647a · 685757b9 · 0cff6df0 · 0cff6df0
Commit 0cff6df0 authored Sep 09, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

lib/gitlab/blacklist.rb lib/gitlab/blacklist.rb +1 -0

No files found.
--- 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

--- a/lib/gitlab/blacklist.rb
+++ b/lib/gitlab/blacklist.rb
@@ -27,6 +27,7 @@ module Gitlab
        notes
        unsubscribes
        all
+        ci
      )
    end
  end