Add latest changes from gitlab-org/gitlab@master

doc/integration/saml.md

@@ -155,7 +155,7 @@ Identity Provider.
 ### Requirements
 First you need to tell GitLab where to look for group information. For this you
-need to make sure that your IdP server sends a specific `AttributeStament` along
+need to make sure that your IdP server sends a specific `AttributeStatement` along
 with the regular SAML response. Here is an example:
 ```xml

lib/api/api.rb

@@ -117,6 +117,7 @@ module API
     mount ::API::DeployKeys
     mount ::API::Deployments
     mount ::API::Environments
+    mount ::API::ErrorTracking
     mount ::API::Events
     mount ::API::Features
     mount ::API::Files

lib/api/deployments.rb

@@ -127,6 +127,26 @@ module API
           render_validation_error!(deployment)
         end
       end
+
+      helpers Helpers::MergeRequestsHelpers
+
+      desc 'Get all merge requests of a deployment' do
+        detail 'This feature was introduced in GitLab 12.7.'
+        success Entities::MergeRequestBasic
+      end
+      params do
+        requires :deployment_id, type: Integer, desc: 'The deployment ID'
+        use :merge_requests_base_params
+      end
+
+      get ':id/deployments/:deployment_id/merge_requests' do
+        authorize! :read_deployment, user_project
+
+        mr_params = declared_params.merge(deployment_id: params[:deployment_id])
+        merge_requests = MergeRequestsFinder.new(current_user, mr_params).execute
+
+        present merge_requests, { with: Entities::MergeRequestBasic, current_user: current_user }
+      end
     end
   end
 end

lib/api/entities/error_tracking.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    module ErrorTracking
+      class ProjectSetting < Grape::Entity
+        expose :project_name
+        expose :sentry_external_url
+        expose :api_url
+      end
+    end
+  end
+end

lib/api/error_tracking.rb

+# frozen_string_literal: true
+
+module API
+  class ErrorTracking < Grape::API
+    before { authenticate! }
+
+    params do
+      requires :id, type: String, desc: 'The ID of a project'
+    end
+
+    resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+      desc 'Get error tracking settings for the project' do
+        detail 'This feature was introduced in GitLab 12.7.'
+        success Entities::ErrorTracking::ProjectSetting
+      end
+
+      get ':id/error_tracking/settings' do
+        authorize! :admin_operations, user_project
+
+        setting = user_project.error_tracking_setting
+
+        not_found!('Error Tracking Setting') unless setting
+
+        present setting, with: Entities::ErrorTracking::ProjectSetting
+      end
+    end
+  end
+end

lib/api/helpers/merge_requests_helpers.rb

+# frozen_string_literal: true
+
+module API
+  module Helpers
+    module MergeRequestsHelpers
+      extend Grape::API::Helpers
+      include ::API::Helpers::CustomValidators
+
+      params :merge_requests_base_params do
+        optional :state,
+                 type: String,
+                 values: %w[opened closed locked merged all],
+                 default: 'all',
+                 desc: 'Return opened, closed, locked, merged, or all merge requests'
+        optional :order_by,
+                 type: String,
+                 values: %w[created_at updated_at],
+                 default: 'created_at',
+                 desc: 'Return merge requests ordered by `created_at` or `updated_at` fields.'
+        optional :sort,
+                 type: String,
+                 values: %w[asc desc],
+                 default: 'desc',
+                 desc: 'Return merge requests sorted in `asc` or `desc` order.'
+        optional :milestone, type: String, desc: 'Return merge requests for a specific milestone'
+        optional :labels,
+                 type: Array[String],
+                 coerce_with: Validations::Types::LabelsList.coerce,
+                 desc: 'Comma-separated list of label names'
+        optional :with_labels_details, type: Boolean, desc: 'Return titles of labels and other details', default: false
+        optional :created_after, type: DateTime, desc: 'Return merge requests created after the specified time'
+        optional :created_before, type: DateTime, desc: 'Return merge requests created before the specified time'
+        optional :updated_after, type: DateTime, desc: 'Return merge requests updated after the specified time'
+        optional :updated_before, type: DateTime, desc: 'Return merge requests updated before the specified time'
+        optional :view,
+                 type: String,
+                 values: %w[simple],
+                 desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request'
+        optional :author_id, type: Integer, desc: 'Return merge requests which are authored by the user with the given ID'
+        optional :assignee_id,
+                 types: [Integer, String],
+                 integer_none_any: true,
+                 desc: 'Return merge requests which are assigned to the user with the given ID'
+        optional :scope,
+                 type: String,
+                 values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
+                 desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
+        optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
+        optional :source_branch, type: String, desc: 'Return merge requests with the given source branch'
+        optional :source_project_id, type: Integer, desc: 'Return merge requests with the given source project id'
+        optional :target_branch, type: String, desc: 'Return merge requests with the given target branch'
+        optional :search,
+                 type: String,
+                 desc: 'Search merge requests for text present in the title, description, or any combination of these'
+        optional :in, type: String, desc: '`title`, `description`, or a string joining them with comma'
+        optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title'
+      end
+
+      params :optional_scope_param do
+        optional :scope,
+                 type: String,
+                 values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
+                 default: 'created_by_me',
+                 desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
+      end
+    end
+  end
+end

lib/api/merge_requests.rb

@@ -7,6 +7,7 @@ module API
     before { authenticate_non_get! }
     helpers ::Gitlab::IssuableMetadata
+    helpers Helpers::MergeRequestsHelpers
     # EE::API::MergeRequests would override the following helpers
     helpers do
@@ -107,33 +108,7 @@ module API
       end
       params :merge_requests_params do
-        optional :state, type: String, values: %w[opened closed locked merged all], default: 'all',
-                         desc: 'Return opened, closed, locked, merged, or all merge requests'
-        optional :order_by, type: String, values: %w[created_at updated_at], default: 'created_at',
-                            desc: 'Return merge requests ordered by `created_at` or `updated_at` fields.'
-        optional :sort, type: String, values: %w[asc desc], default: 'desc',
-                        desc: 'Return merge requests sorted in `asc` or `desc` order.'
-        optional :milestone, type: String, desc: 'Return merge requests for a specific milestone'
-        optional :labels, type: Array[String], coerce_with: Validations::Types::LabelsList.coerce, desc: 'Comma-separated list of label names'
-        optional :with_labels_details, type: Boolean, desc: 'Return titles of labels and other details', default: false
-        optional :created_after, type: DateTime, desc: 'Return merge requests created after the specified time'
-        optional :created_before, type: DateTime, desc: 'Return merge requests created before the specified time'
-        optional :updated_after, type: DateTime, desc: 'Return merge requests updated after the specified time'
-        optional :updated_before, type: DateTime, desc: 'Return merge requests updated before the specified time'
-        optional :view, type: String, values: %w[simple], desc: 'If simple, returns the `iid`, URL, title, description, and basic state of merge request'
-        optional :author_id, type: Integer, desc: 'Return merge requests which are authored by the user with the given ID'
-        optional :assignee_id, types: [Integer, String], integer_none_any: true,
-                               desc: 'Return merge requests which are assigned to the user with the given ID'
-        optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all],
-                         desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
-        optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji'
-        optional :source_branch, type: String, desc: 'Return merge requests with the given source branch'
-        optional :source_project_id, type: Integer, desc: 'Return merge requests with the given source project id'
-        optional :target_branch, type: String, desc: 'Return merge requests with the given target branch'
-        optional :search, type: String, desc: 'Search merge requests for text present in the title, description, or any combination of these'
-        optional :in, type: String, desc: '`title`, `description`, or a string joining them with comma'
-        optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title'
-
+        use :merge_requests_base_params
         use :optional_merge_requests_search_params
         use :pagination
       end
@@ -145,8 +120,7 @@ module API
       end
       params do
         use :merge_requests_params
-        optional :scope, type: String, values: %w[created-by-me assigned-to-me created_by_me assigned_to_me all], default: 'created_by_me',
-                         desc: 'Return merge requests for the given scope: `created_by_me`, `assigned_to_me` or `all`'
+        use :optional_scope_param
       end
       get do
         authenticate! unless params[:scope] == 'all'

lib/gitlab/app_json_logger.rb

+# frozen_string_literal: true
+
+module Gitlab
+  class AppJsonLogger < Gitlab::JsonLogger
+    def self.file_name_noext
+      'application_json'
+    end
+  end
+end

lib/gitlab/app_logger.rb

 # frozen_string_literal: true
 module Gitlab
-  class AppLogger < Gitlab::Logger
-    def self.file_name_noext
-      'application'
+  class AppLogger < Gitlab::MultiDestinationLogger
+    LOGGERS = [Gitlab::AppTextLogger, Gitlab::AppJsonLogger].freeze
+
+    def self.loggers
+      LOGGERS
     end
-    def format_message(severity, timestamp, progname, msg)
-      "#{timestamp.to_s(:long)}: #{msg}\n"
+    def self.primary_logger
+      Gitlab::AppTextLogger
     end
   end
 end

lib/gitlab/app_text_logger.rb

+# frozen_string_literal: true
+
+module Gitlab
+  class AppTextLogger < Gitlab::Logger
+    def self.file_name_noext
+      'application'
+    end
+
+    def format_message(severity, timestamp, progname, msg)
+      "#{timestamp.to_s(:long)}: #{msg}\n"
+    end
+  end
+end

lib/gitlab/multi_destination_logger.rb

+# frozen_string_literal: true
+
+module Gitlab
+  class MultiDestinationLogger < ::Logger
+    def close
+      loggers.each(&:close)
+    end
+
+    def self.debug(message)
+      loggers.each { |logger| logger.build.debug(message) }
+    end
+
+    def self.error(message)
+      loggers.each { |logger| logger.build.error(message) }
+    end
+
+    def self.warn(message)
+      loggers.each { |logger| logger.build.warn(message) }
+    end
+
+    def self.info(message)
+      loggers.each { |logger| logger.build.info(message) }
+    end
+
+    def self.read_latest
+      primary_logger.read_latest
+    end
+
+    def self.file_name
+      primary_logger.file_name
+    end
+
+    def self.full_log_path
+      primary_logger.full_log_path
+    end
+
+    def self.file_name_noext
+      primary_logger.file_name_noext
+    end
+
+    def self.loggers
+      raise NotImplementedError
+    end
+
+    def self.primary_logger
+      raise NotImplementedError
+    end
+  end
+end

package.json

@@ -66,7 +66,7 @@
     "core-js": "^3.2.1",
     "cropper": "^2.3.0",
     "css-loader": "^1.0.0",
-    "d3": "^4.13.0",
+    "d3": "^5.12.0",
     "d3-scale": "^1.0.7",
     "d3-selection": "^1.2.0",
     "dateformat": "^3.0.3",

qa/qa/specs/features/browser_ui/2_plan/email/trigger_email_notification_spec.rb

@@ -22,8 +22,15 @@ module QA
         expect(page).to have_content(/@#{user.username}(\n| )?Given access/)
-        # Wait for Action Mailer to deliver messages
-        mailhog_json = Support::Retrier.retry_until(sleep_interval: 1) do
+        mailhog_items = mailhog_json.dig('items')
+
+        expect(mailhog_items).to include(an_object_satisfying { |o| /project was granted/ === o.dig('Content', 'Headers', 'Subject', 0) })
+      end
+
+      private
+
+      def mailhog_json
+        Support::Retrier.retry_until(sleep_interval: 1) do
           Runtime::Logger.debug(%Q[retrieving "#{QA::Runtime::MailHog.api_messages_url}"])
           mailhog_response = get QA::Runtime::MailHog.api_messages_url
@@ -33,10 +40,6 @@ module QA
           # Expect at least two invitation messages: group and project
           mailhog_data if mailhog_data.dig('total') >= 2
         end
-
-        # Check json result from mailhog
-        mailhog_items = mailhog_json.dig('items')
-        expect(mailhog_items).to include(an_object_satisfying { |o| /project was granted/ === o.dig('Content', 'Headers', 'Subject', 0) })
       end
     end
   end

qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb

@@ -28,11 +28,9 @@ module QA
         end
         before do
-          issue = Resource::Issue.fabricate_via_api! do |issue|
+          Resource::Issue.fabricate_via_api! do |issue|
             issue.title = issue_title
-          end
-
-          issue.visit!
+          end.visit!
         end
         it 'user comments on an issue with an attachment' do

qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb

@@ -8,11 +8,9 @@ module QA
       before do
         Flow::Login.sign_in
-        issue = Resource::Issue.fabricate_via_api! do |issue|
+        Resource::Issue.fabricate_via_api! do |issue|
           issue.title = issue_title
-        end
-
-        issue.visit!
+        end.visit!
       end
       it 'user filters comments and activities in an issue' do

spec/finders/merge_requests_finder_spec.rb

@@ -166,6 +166,38 @@ describe MergeRequestsFinder do
           expect(scalar_params).to include(:wip, :assignee_id)
         end
+
+        context 'filter by deployment' do
+          let_it_be(:project_with_repo) { create(:project, :repository) }
+
+          it 'returns the relevant merge requests' do
+            deployment1 = create(
+              :deployment,
+              project: project_with_repo,
+              sha: project_with_repo.commit.id,
+              merge_requests: [merge_request1, merge_request2]
+            )
+            create(
+              :deployment,
+              project: project_with_repo,
+              sha: project_with_repo.commit.id,
+              merge_requests: [merge_request3]
+            )
+            params = { deployment_id: deployment1.id }
+            merge_requests = described_class.new(user, params).execute
+
+            expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
+          end
+
+          context 'when a deployment does not contain any merge requests' do
+            it 'returns an empty result' do
+              params = { deployment_id: create(:deployment, project: project_with_repo, sha: project_with_repo.commit.sha).id }
+              merge_requests = described_class.new(user, params).execute
+
+              expect(merge_requests).to be_empty
+            end
+          end
+        end
       end
       context 'assignee filtering' do

spec/lib/gitlab/app_json_logger_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::AppJsonLogger do
+  subject { described_class.new('/dev/null') }
+
+  let(:hash_message) { { 'message' => 'Message', 'project_id' => '123' } }
+  let(:string_message) { 'Information' }
+
+  it 'logs a hash as a JSON' do
+    expect(JSON.parse(subject.format_message('INFO', Time.now, nil, hash_message))).to include(hash_message)
+  end
+
+  it 'logs a string as a JSON' do
+    expect(JSON.parse(subject.format_message('INFO', Time.now, nil, string_message))).to include('message' => string_message)
+  end
+end

spec/lib/gitlab/app_logger_spec.rb

@@ -2,13 +2,21 @@
 require 'spec_helper'
-describe Gitlab::AppLogger, :request_store do
+describe Gitlab::AppLogger do
   subject { described_class }
-  it 'builds a logger once' do
-    expect(::Logger).to receive(:new).and_call_original
-    subject.info('hello world')
-    subject.error('hello again')
+  it 'builds a Gitlab::Logger object twice' do
+    expect(Gitlab::Logger).to receive(:new)
+      .exactly(described_class.loggers.size)
+      .and_call_original
+    subject.info('Hello World!')
+  end
+
+  it 'logs info to AppLogger and AppJsonLogger' do
+    expect_any_instance_of(Gitlab::AppTextLogger).to receive(:info).and_call_original
+    expect_any_instance_of(Gitlab::AppJsonLogger).to receive(:info).and_call_original
+
+    subject.info('Hello World!')
   end
 end

spec/lib/gitlab/app_text_logger_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::AppTextLogger do
+  subject { described_class.new('/dev/null') }
+
+  let(:hash_message) { { message: 'Message', project_id: 123 } }
+  let(:string_message) { 'Information' }
+
+  it 'logs a hash as string' do
+    expect(subject.format_message('INFO', Time.now, nil, hash_message )).to include(hash_message.to_s)
+  end
+
+  it 'logs a string unchanged' do
+    expect(subject.format_message('INFO', Time.now, nil, string_message)).to include(string_message)
+  end
+end

spec/lib/gitlab/multi_destination_logger_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+class FakeLogger
+end
+
+class LoggerA < Gitlab::Logger
+  def self.file_name_noext
+    'loggerA'
+  end
+end
+
+class LoggerB < Gitlab::JsonLogger
+  def self.file_name_noext
+    'loggerB'
+  end
+end
+
+class TestLogger < Gitlab::MultiDestinationLogger
+  LOGGERS = [LoggerA, LoggerB].freeze
+
+  def self.loggers
+    LOGGERS
+  end
+end
+
+class EmptyLogger < Gitlab::MultiDestinationLogger
+  def self.loggers
+    []
+  end
+end
+
+describe Gitlab::MultiDestinationLogger do
+  after(:all) do
+    TestLogger.loggers.each do |logger|
+      log_file_path = "#{Rails.root}/log/#{logger.file_name}"
+      File.delete(log_file_path)
+    end
+  end
+
+  context 'with no primary logger set' do
+    subject { EmptyLogger }
+
+    it 'primary_logger raises an error' do
+      expect { subject.primary_logger }.to raise_error(NotImplementedError)
+    end
+  end
+
+  context 'with 2 loggers set' do
+    subject { TestLogger }
+
+    it 'logs info to 2 loggers' do
+      expect(subject.loggers).to all(receive(:build).and_call_original)
+
+      subject.info('Hello World')
+    end
+  end
+end