Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

4 files changed, 13 insertions, 9 deletions

diff --git a/lib/gitlab/phabricator_import/issues/importer.rb b/lib/gitlab/phabricator_import/issues/importer.rb
index a58438452ff..478c26af030 100644
--- a/lib/gitlab/phabricator_import/issues/importer.rb
+++ b/lib/gitlab/phabricator_import/issues/importer.rb
@@ -4,7 +4,8 @@ module Gitlab
     module Issues
       class Importer
         def initialize(project, after = nil)
-          @project, @after = project, after
+          @project = project
+          @after = after
         end
 
         def execute
diff --git a/lib/gitlab/phabricator_import/issues/task_importer.rb b/lib/gitlab/phabricator_import/issues/task_importer.rb
index c17f3e1729a..9c419ecb700 100644
--- a/lib/gitlab/phabricator_import/issues/task_importer.rb
+++ b/lib/gitlab/phabricator_import/issues/task_importer.rb
@@ -4,7 +4,8 @@ module Gitlab
     module Issues
       class TaskImporter
         def initialize(project, task)
-          @project, @task = project, task
+          @project = project
+          @task = task
         end
 
         def execute
diff --git a/lib/gitlab/phabricator_import/project_creator.rb b/lib/gitlab/phabricator_import/project_creator.rb
index b37a5b44980..c842798ca74 100644
--- a/lib/gitlab/phabricator_import/project_creator.rb
+++ b/lib/gitlab/phabricator_import/project_creator.rb
@@ -55,12 +55,13 @@ module Gitlab
       end
 
       def project_feature_attributes
-        @project_features_attributes ||= begin
-                                           # everything disabled except for issues
-                                           ProjectFeature::FEATURES.map do |feature|
-                                             [ProjectFeature.access_level_attribute(feature), ProjectFeature::DISABLED]
-                                           end.to_h.merge(ProjectFeature.access_level_attribute(:issues) => ProjectFeature::ENABLED)
-                                         end
+        @project_features_attributes ||=
+          begin
+            # everything disabled except for issues
+            ProjectFeature::FEATURES.to_h do |feature|
+              [ProjectFeature.access_level_attribute(feature), ProjectFeature::DISABLED]
+            end.merge(ProjectFeature.access_level_attribute(:issues) => ProjectFeature::ENABLED)
+          end
       end
 
       def import_data
diff --git a/lib/gitlab/phabricator_import/user_finder.rb b/lib/gitlab/phabricator_import/user_finder.rb
index 4b50431e0e0..c6058d12527 100644
--- a/lib/gitlab/phabricator_import/user_finder.rb
+++ b/lib/gitlab/phabricator_import/user_finder.rb
@@ -4,7 +4,8 @@ module Gitlab
   module PhabricatorImport
     class UserFinder
       def initialize(project, phids)
-        @project, @phids = project, phids
+        @project = project
+        @phids = phids
         @loaded_phids = Set.new
       end