Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

app/helpers/labels_helper.rb

@@ -14,14 +14,27 @@ module LabelsHelper
 
   def suggested_colors
     [
-      '#D9534F',
-      '#F0AD4E',
+      '#0033CC',
       '#428BCA',
+      '#44AD8E',
+      '#A8D695',
       '#5CB85C',
+      '#69D100',
+      '#004E00',
       '#34495E',
       '#7F8C8D',
+      '#A295D6',
+      '#5843AD',
       '#8E44AD',
-      '#FFECDB'
+      '#FFECDB',
+      '#AD4363',
+      '#D10069',
+      '#CC0033',
+      '#FF0000',
+      '#D9534F',
+      '#D1D100',
+      '#F0AD4E',
+      '#AD8D43'
     ]
   end
 

app/views/projects/labels/_form.html.haml

@@ -16,7 +16,7 @@
     .col-sm-10
       .input-group
         .input-group-addon.label-color-preview  
-        = f.text_field :color, placeholder: "#AA33EE", class: "form-control"
+        = f.color_field :color, placeholder: "#AA33EE", class: "form-control"
       .help-block
         6 character hex values starting with a # sign.
         %br