Add changelog item, fix rubocop issue

8039856d · Z.J. van de Weg · Alfredo Sumaran · 5d121892 · 8039856d · 8039856d
Commit 8039856d authored Jun 16, 2016 by Z.J. van de Weg Committed by Alfredo Sumaran Jun 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

gitlab_ci_yml.rb lib/gitlab/template/gitlab_ci_yml.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -102,6 +102,7 @@ v 8.9.0 (unreleased)
  - An indicator is now displayed at the top of the comment field for confidential issues.
  - Show categorised search queries in the search autocomplete
  - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
+  - Dropdown for `.gitlab-ci.yml` templates
  - Improve issuables APIs performance when accessing notes !4471
  - Add sorting dropdown to tags page !4423
  - External links now open in a new tab

--- a/lib/gitlab/template/gitlab_ci_yml.rb
+++ b/lib/gitlab/template/gitlab_ci_yml.rb
@@ -9,7 +9,7 @@ module Gitlab
        def categories
          {
            "General" => '',
-            "Pages"   =>'Pages'
+            "Pages" => 'Pages'
          }
        end