Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPatrick Derichs <pderichs@gitlab.com>2019-05-08 15:39:54 +0300
committerMayra Cabrera <mcabrera@gitlab.com>2019-05-08 15:39:54 +0300
commitb145d9b8734961d391dbb3a96612c71b0684d22a (patch)
treebfda79905153170154cc9530a16f2a4cc3387d36 /lib
parenta2128edfee799e49a8732bfa235e2c5e14949c68 (diff)
Refactor spec to reload existing_label right after creation
This will avoid timestamp comparison issues later within equality check with attributes
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/bitbucket_import/importer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 769d3279f91..c9f0ed66a54 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -135,7 +135,7 @@ module Gitlab
def create_labels
LABELS.each do |label_params|
- label = ::Labels::CreateService.new(label_params).execute(project: project)
+ label = ::Labels::FindOrCreateService.new(nil, project, label_params).execute(skip_authorization: true)
if label.valid?
@labels[label_params[:title]] = label
else