Merge branch 'api-labels-spec' into 'master'

POST should be PUT in the API labels specs

See merge request gitlab-org/gitlab-ce!21369

spec/requests/api/labels_spec.rb

@@ -306,16 +306,16 @@ describe API::Labels do
     end
 
     it 'returns 400 for too long color code' do
-      post api("/projects/#{project.id}/labels", user),
-           name: 'Foo',
+      put api("/projects/#{project.id}/labels", user),
+           name: 'label1',
            color: '#FFAAFFFF'
       expect(response).to have_gitlab_http_status(400)
       expect(json_response['message']['color']).to eq(['must be a valid color code'])
     end
 
     it 'returns 400 for invalid priority' do
-      post api("/projects/#{project.id}/labels", user),
-           name: 'Foo',
+      put api("/projects/#{project.id}/labels", user),
+           name: 'label1',
            priority: 'foo'
 
       expect(response).to have_gitlab_http_status(400)