Add latest changes from gitlab-org/gitlab@master

lib/api/entities/deployment.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Deployment < Grape::Entity
+      expose :id, :iid, :ref, :sha, :created_at, :updated_at
+      expose :user,        using: Entities::UserBasic
+      expose :environment, using: Entities::EnvironmentBasic
+      expose :deployable,  using: Entities::Job
+      expose :status
+    end
+  end
+end

lib/api/entities/environment.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Environment < Entities::EnvironmentBasic
+      expose :project, using: Entities::BasicProjectDetails
+      expose :last_deployment, using: Entities::Deployment, if: { last_deployment: true }
+      expose :state
+    end
+  end
+end

lib/api/entities/environment_basic.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class EnvironmentBasic < Grape::Entity
+      expose :id, :name, :slug, :external_url
+    end
+  end
+end

lib/api/entities/group_access.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class GroupAccess < MemberAccess
+    end
+  end
+end

lib/api/entities/job_request/artifacts.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Artifacts < Grape::Entity
+        expose :name
+        expose :untracked
+        expose :paths
+        expose :when
+        expose :expire_in
+        expose :artifact_type
+        expose :artifact_format
+      end
+    end
+  end
+end

lib/api/entities/job_request/cache.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Cache < Grape::Entity
+        expose :key, :untracked, :paths, :policy
+      end
+    end
+  end
+end

lib/api/entities/job_request/credentials.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Credentials < Grape::Entity
+        expose :type, :url, :username, :password
+      end
+    end
+  end
+end

lib/api/entities/job_request/dependency.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Dependency < Grape::Entity
+        expose :id, :name, :token
+        expose :artifacts_file, using: Entities::JobArtifactFile, if: ->(job, _) { job.artifacts? }
+      end
+    end
+  end
+end

lib/api/entities/job_request/git_info.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class GitInfo < Grape::Entity
+        expose :repo_url, :ref, :sha, :before_sha
+        expose :ref_type
+        expose :refspecs
+        expose :git_depth, as: :depth
+      end
+    end
+  end
+end

lib/api/entities/job_request/image.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Image < Grape::Entity
+        expose :name, :entrypoint
+        expose :ports, using: Entities::JobRequest::Port
+      end
+    end
+  end
+end

lib/api/entities/job_request/job_info.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class JobInfo < Grape::Entity
+        expose :name, :stage
+        expose :project_id, :project_name
+      end
+    end
+  end
+end

lib/api/entities/job_request/port.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Port < Grape::Entity
+        expose :number, :protocol, :name
+      end
+    end
+  end
+end

lib/api/entities/job_request/response.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Response < Grape::Entity
+        expose :id
+        expose :token
+        expose :allow_git_fetch
+
+        expose :job_info, using: Entities::JobRequest::JobInfo do |model|
+          model
+        end
+
+        expose :git_info, using: Entities::JobRequest::GitInfo do |model|
+          model
+        end
+
+        expose :runner_info, using: Entities::JobRequest::RunnerInfo do |model|
+          model
+        end
+
+        expose :variables
+        expose :steps, using: Entities::JobRequest::Step
+        expose :image, using: Entities::JobRequest::Image
+        expose :services, using: Entities::JobRequest::Service
+        expose :artifacts, using: Entities::JobRequest::Artifacts
+        expose :cache, using: Entities::JobRequest::Cache
+        expose :credentials, using: Entities::JobRequest::Credentials
+        expose :all_dependencies, as: :dependencies, using: Entities::JobRequest::Dependency
+        expose :features
+      end
+    end
+  end
+end

lib/api/entities/job_request/runner_info.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class RunnerInfo < Grape::Entity
+        expose :metadata_timeout, as: :timeout
+        expose :runner_session_url
+      end
+    end
+  end
+end

lib/api/entities/job_request/service.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Service < Entities::JobRequest::Image
+        expose :alias, :command
+      end
+    end
+  end
+end

lib/api/entities/job_request/step.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module JobRequest
+      class Step < Grape::Entity
+        expose :name, :script, :timeout, :when, :allow_failure
+      end
+    end
+  end
+end

lib/api/entities/license.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class License < Entities::LicenseBasic
+      expose :popular?, as: :popular
+      expose(:description) { |license| license.meta['description'] }
+      expose(:conditions) { |license| license.meta['conditions'] }
+      expose(:permissions) { |license| license.meta['permissions'] }
+      expose(:limitations) { |license| license.meta['limitations'] }
+      expose :content
+    end
+  end
+end

lib/api/entities/license_basic.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class LicenseBasic < Grape::Entity
+      expose :key, :name, :nickname
+      expose :url, as: :html_url
+      expose(:source_url) { |license| license.meta['source'] }
+    end
+  end
+end

lib/api/entities/member_access.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class MemberAccess < Grape::Entity
+      expose :access_level
+      expose :notification_level do |member, options|
+        if member.notification_setting
+          ::NotificationSetting.levels[member.notification_setting.level]
+        end
+      end
+    end
+  end
+end

lib/api/entities/namespace.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Namespace < Entities::NamespaceBasic
+      expose :members_count_with_descendants, if: -> (namespace, opts) { expose_members_count_with_descendants?(namespace, opts) } do |namespace, _|
+        namespace.users_with_descendants.count
+      end
+
+      def expose_members_count_with_descendants?(namespace, opts)
+        namespace.kind == 'group' && Ability.allowed?(opts[:current_user], :admin_group, namespace)
+      end
+    end
+  end
+end