diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-10-28 15:01:59 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-10-28 15:01:59 +0000 |
commit | 44cbfeaba87b2b659f22c802920004d6dff1b53a (patch) | |
tree | f9350192e68739674ea3772070757dbd5fdc44a8 /lib/gitlab/github_import | |
parent | d306b0d7c2c1f9384382c2a90a9d7c43bd20573c (diff) | |
parent | e2c603696a9647c15cd154156f13d0e203a930f1 (diff) | |
download | gitlab-ce-44cbfeaba87b2b659f22c802920004d6dff1b53a.tar.gz |
Merge branch 'adam-fix-labels-find-or-create' into 'master'
Pass user instance to Labels::FindOrCreateService or skip_authorization: true
## What does this MR do?
It fixes a bug described in #23694 when `project.owner` was passed to `Labels::FindOrCreateService`. `Labels::FindOrCreateService` expected a user instance and `project.owner` may return a group as well. This MR makes sure that we either pass a user instance or `skip_authorization: true`.
## Are there points in the code the reviewer needs to double check?
- places where we pass `skip_authorization: true`
## Does this MR meet the acceptance criteria?
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Fixes #23694
See merge request !7093
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r-- | lib/gitlab/github_import/label_formatter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/label_formatter.rb b/lib/gitlab/github_import/label_formatter.rb index 002494739e9..211ccdc51bb 100644 --- a/lib/gitlab/github_import/label_formatter.rb +++ b/lib/gitlab/github_import/label_formatter.rb @@ -15,8 +15,8 @@ module Gitlab def create! params = attributes.except(:project) - service = ::Labels::FindOrCreateService.new(project.owner, project, params) - label = service.execute + service = ::Labels::FindOrCreateService.new(nil, project, params) + label = service.execute(skip_authorization: true) raise ActiveRecord::RecordInvalid.new(label) unless label.persisted? |