Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

19 files changed, 203 insertions, 8 deletions

diff --git a/lib/api/entities/ci/lint/result.rb b/lib/api/entities/ci/lint/result.rb
new file mode 100644
index 00000000000..0e4aa238ba2
--- /dev/null
+++ b/lib/api/entities/ci/lint/result.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Ci
+      module Lint
+        class Result < Grape::Entity
+          expose :valid?, as: :valid
+          expose :errors
+          expose :warnings
+          expose :merged_yaml
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/cluster.rb b/lib/api/entities/cluster.rb
index 4cb54e988ce..67459092a33 100644
--- a/lib/api/entities/cluster.rb
+++ b/lib/api/entities/cluster.rb
@@ -4,7 +4,7 @@ module API
   module Entities
     class Cluster < Grape::Entity
       expose :id, :name, :created_at, :domain
-      expose :provider_type, :platform_type, :environment_scope, :cluster_type
+      expose :provider_type, :platform_type, :environment_scope, :cluster_type, :namespace_per_environment
       expose :user, using: Entities::UserBasic
       expose :platform_kubernetes, using: Entities::Platform::Kubernetes
       expose :provider_gcp, using: Entities::Provider::Gcp
diff --git a/lib/api/entities/container_registry.rb b/lib/api/entities/container_registry.rb
index cff627ab50a..c430b73580b 100644
--- a/lib/api/entities/container_registry.rb
+++ b/lib/api/entities/container_registry.rb
@@ -16,6 +16,7 @@ module API
         expose :project_id
         expose :location
         expose :created_at
+        expose :expiration_policy_started_at, as: :cleanup_policy_started_at
         expose :tags_count, if: -> (_, options) { options[:tags_count] }
         expose :tags, using: Tag, if: -> (_, options) { options[:tags] }
       end
diff --git a/lib/api/entities/feature_flag.rb b/lib/api/entities/feature_flag.rb
new file mode 100644
index 00000000000..82fdb20af00
--- /dev/null
+++ b/lib/api/entities/feature_flag.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      expose :name
+      expose :description
+      expose :active
+      expose :version, if: :feature_flags_new_version_enabled
+      expose :created_at
+      expose :updated_at
+      expose :scopes, using: FeatureFlag::LegacyScope
+      expose :strategies, using: FeatureFlag::Strategy, if: :feature_flags_new_version_enabled
+    end
+  end
+end
diff --git a/lib/api/entities/feature_flag/detailed_legacy_scope.rb b/lib/api/entities/feature_flag/detailed_legacy_scope.rb
new file mode 100644
index 00000000000..47078c1dfde
--- /dev/null
+++ b/lib/api/entities/feature_flag/detailed_legacy_scope.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      class DetailedLegacyScope < LegacyScope
+        expose :name
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/feature_flag/legacy_scope.rb b/lib/api/entities/feature_flag/legacy_scope.rb
new file mode 100644
index 00000000000..7329f71c599
--- /dev/null
+++ b/lib/api/entities/feature_flag/legacy_scope.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      class LegacyScope < Grape::Entity
+        expose :id
+        expose :active
+        expose :environment_scope
+        expose :strategies
+        expose :created_at
+        expose :updated_at
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/feature_flag/scope.rb b/lib/api/entities/feature_flag/scope.rb
new file mode 100644
index 00000000000..906fe718257
--- /dev/null
+++ b/lib/api/entities/feature_flag/scope.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      class Scope < Grape::Entity
+        expose :id
+        expose :environment_scope
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/feature_flag/strategy.rb b/lib/api/entities/feature_flag/strategy.rb
new file mode 100644
index 00000000000..32699be0ee3
--- /dev/null
+++ b/lib/api/entities/feature_flag/strategy.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      class Strategy < Grape::Entity
+        expose :id
+        expose :name
+        expose :parameters
+        expose :scopes, using: FeatureFlag::Scope
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/feature_flag/user_list.rb b/lib/api/entities/feature_flag/user_list.rb
new file mode 100644
index 00000000000..bc8b12ea22e
--- /dev/null
+++ b/lib/api/entities/feature_flag/user_list.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class FeatureFlag < Grape::Entity
+      class UserList < Grape::Entity
+        include RequestAwareEntity
+
+        expose :id
+        expose :iid
+        expose :project_id
+        expose :created_at
+        expose :updated_at
+        expose :name
+        expose :user_xids
+
+        expose :path do |list|
+          project_feature_flags_user_list_path(list.project, list)
+        end
+
+        expose :edit_path do |list|
+          edit_project_feature_flags_user_list_path(list.project, list)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/job_request/cache.rb b/lib/api/entities/job_request/cache.rb
index a75affbaf84..cd533d7e5b3 100644
--- a/lib/api/entities/job_request/cache.rb
+++ b/lib/api/entities/job_request/cache.rb
@@ -4,7 +4,7 @@ module API
   module Entities
     module JobRequest
       class Cache < Grape::Entity
-        expose :key, :untracked, :paths, :policy
+        expose :key, :untracked, :paths, :policy, :when
       end
     end
   end
diff --git a/lib/api/entities/member.rb b/lib/api/entities/member.rb
index 14e97f41e77..ad62f92e5a0 100644
--- a/lib/api/entities/member.rb
+++ b/lib/api/entities/member.rb
@@ -5,6 +5,7 @@ module API
     class Member < Grape::Entity
       expose :user, merge: true, using: UserBasic
       expose :access_level
+      expose :created_at
       expose :expires_at
     end
   end
diff --git a/lib/api/entities/package.rb b/lib/api/entities/package.rb
index d903f50befa..b54f0e04a9d 100644
--- a/lib/api/entities/package.rb
+++ b/lib/api/entities/package.rb
@@ -7,7 +7,19 @@ module API
       extend ::API::Entities::EntityHelpers
 
       expose :id
-      expose :name
+
+      expose :name do |package|
+        if package.conan?
+          package.conan_recipe
+        else
+          package.name
+        end
+      end
+
+      expose :conan_package_name, if: ->(package) { package.conan? } do |package|
+        package.name
+      end
+
       expose :version
       expose :package_type
 
diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb
index fb599d68d72..82a44c75382 100644
--- a/lib/api/entities/project.rb
+++ b/lib/api/entities/project.rb
@@ -84,6 +84,7 @@ module API
       expose :open_issues_count, if: lambda { |project, options| project.feature_available?(:issues, options[:current_user]) }
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
       expose :ci_default_git_depth
+      expose :ci_forward_deployment_enabled
       expose :public_builds, as: :public_jobs
       expose :build_git_strategy, if: lambda { |project, options| options[:user_can_admin_project] } do |project, options|
         project.build_allow_git_fetch ? 'fetch' : 'clone'
diff --git a/lib/api/entities/snippet.rb b/lib/api/entities/snippet.rb
index 40488eb882d..85148c03d18 100644
--- a/lib/api/entities/snippet.rb
+++ b/lib/api/entities/snippet.rb
@@ -17,7 +17,7 @@ module API
       expose :file_name do |snippet|
         snippet.file_name_on_repo || snippet.file_name
       end
-      expose :files, if: ->(snippet, options) { snippet_multiple_files?(snippet, options[:current_user]) } do |snippet, options|
+      expose :files do |snippet, options|
         snippet.list_files.map do |file|
           {
             path: file,
@@ -25,10 +25,6 @@ module API
           }
         end
       end
-
-      def snippet_multiple_files?(snippet, current_user)
-        ::Feature.enabled?(:snippet_multiple_files, current_user) && snippet.repository_exists?
-      end
     end
   end
 end
diff --git a/lib/api/entities/unleash_feature.rb b/lib/api/entities/unleash_feature.rb
new file mode 100644
index 00000000000..8ee87d1fc11
--- /dev/null
+++ b/lib/api/entities/unleash_feature.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class UnleashFeature < Grape::Entity
+      expose :name
+      expose :description, unless: ->(feature) { feature.description.nil? }
+      expose :active, as: :enabled
+      expose :strategies do |flag|
+        flag.strategies.map do |strategy|
+          if legacy_strategy?(strategy)
+            UnleashLegacyStrategy.represent(strategy)
+          elsif gitlab_user_list_strategy?(strategy)
+            UnleashGitlabUserListStrategy.represent(strategy)
+          else
+            UnleashStrategy.represent(strategy)
+          end
+        end
+      end
+
+      private
+
+      def legacy_strategy?(strategy)
+        !strategy.respond_to?(:name)
+      end
+
+      def gitlab_user_list_strategy?(strategy)
+        strategy.name == ::Operations::FeatureFlags::Strategy::STRATEGY_GITLABUSERLIST
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/unleash_gitlab_user_list_strategy.rb b/lib/api/entities/unleash_gitlab_user_list_strategy.rb
new file mode 100644
index 00000000000..5617f8002d9
--- /dev/null
+++ b/lib/api/entities/unleash_gitlab_user_list_strategy.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class UnleashGitlabUserListStrategy < Grape::Entity
+      expose :name do |_strategy|
+        ::Operations::FeatureFlags::Strategy::STRATEGY_USERWITHID
+      end
+      expose :parameters do |strategy|
+        { userIds: strategy.user_list.user_xids }
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/unleash_legacy_strategy.rb b/lib/api/entities/unleash_legacy_strategy.rb
new file mode 100644
index 00000000000..5d5954f8da0
--- /dev/null
+++ b/lib/api/entities/unleash_legacy_strategy.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class UnleashLegacyStrategy < Grape::Entity
+      expose :name do |strategy|
+        strategy['name']
+      end
+      expose :parameters do |strategy|
+        strategy['parameters']
+      end
+    end
+  end
+end
diff --git a/lib/api/entities/unleash_strategy.rb b/lib/api/entities/unleash_strategy.rb
new file mode 100644
index 00000000000..7627ce3873c
--- /dev/null
+++ b/lib/api/entities/unleash_strategy.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    class UnleashStrategy < Grape::Entity
+      expose :name
+      expose :parameters
+    end
+  end
+end
diff --git a/lib/api/entities/user_with_admin.rb b/lib/api/entities/user_with_admin.rb
index c225ade6eb6..ab7bc738ff8 100644
--- a/lib/api/entities/user_with_admin.rb
+++ b/lib/api/entities/user_with_admin.rb
@@ -8,3 +8,5 @@ module API
     end
   end
 end
+
+API::Entities::UserWithAdmin.prepend_if_ee('EE::API::Entities::UserWithAdmin')