Merge branch 'sh-fix-broken-label-controller' into 'master'

Fix error in generating labels

Attempting to generate default set of labels would result in
an error:

ArgumentError: wrong number of arguments (given 1, expected 0)

Closes #23649

See merge request !7055

Signed-off-by: Rémy Coutable <remy@rymai.me>

3 files changed, 17 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4d3a6c1377..c7f9aeef417 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date.
   - Refactor and add new environment functionality to CI yaml reference. !7026
   - Fix typo in project settings that prevents users from enabling container registry. !7037
   - Remove extra line for empty issue description. !7045
+  - Fix error in generating labels. !7055
 
 ## 8.13.0 (2016-10-22)
 
diff --git a/lib/gitlab/issues_labels.rb b/lib/gitlab/issues_labels.rb
index 01a2c19ab23..dbc759367eb 100644
--- a/lib/gitlab/issues_labels.rb
+++ b/lib/gitlab/issues_labels.rb
@@ -19,7 +19,7 @@ module Gitlab
         ]
 
         labels.each do |params|
-          ::Labels::FindOrCreateService.new(project.owner, project).execute(params)
+          ::Labels::FindOrCreateService.new(project.owner, project, params).execute
         end
       end
     end
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index 622ab154493..41df63d445a 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -70,4 +70,19 @@ describe Projects::LabelsController do
       get :index, namespace_id: project.namespace.to_param, project_id: project.to_param
     end
   end
+
+  describe 'POST #generate' do
+    let(:admin) { create(:admin) }
+    let(:project) { create(:empty_project) }
+
+    before do
+      sign_in(admin)
+    end
+
+    it 'creates labels' do
+      post :generate, namespace_id: project.namespace.to_param, project_id: project.to_param
+
+      expect(response).to have_http_status(302)
+    end
+  end
 end