diff options
author | Stan Hu <stanhu@gmail.com> | 2016-10-22 01:59:40 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2016-10-22 02:16:21 -0700 |
commit | 0890aeb61a5378ec3bb98511de236ee01eee8711 (patch) | |
tree | 2d2507a19e7e3ba347172f85ae413d23f5b306fc | |
parent | 4ae57e0b374bbb8e461305d8a7a68b550bdd768d (diff) | |
download | gitlab-ce-sh-fix-broken-label-controller.tar.gz |
Fix error in generating labelssh-fix-broken-label-controller
Attempting to generate default set of labels would result in
an error:
ArgumentError: wrong number of arguments (given 1, expected 0)
Closes #23649
-rw-r--r-- | CHANGELOG.md | 3 | ||||
-rw-r--r-- | lib/gitlab/issues_labels.rb | 2 | ||||
-rw-r--r-- | spec/controllers/projects/labels_controller_spec.rb | 15 |
3 files changed, 19 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c39ddca7cf..bfc6a586ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ Please view this file on the master branch, on stable branches it's out of date. - Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests method +## 8.13.1 (unreleased) + - Fix error in generating labels + ## 8.13.0 (2016-10-22) - Fix save button on project pipeline settings page. (!6955) 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..7ba4406c1f6 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.code).to eq(302) + end + end end |