Add latest changes from gitlab-org/gitlab@master

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
+## 12.6.4
+
+- No changes.
+
 ## 12.6.2
 ### Security (2 changes)
@@ -228,6 +232,10 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Remove IIFEs from jira_connect.js file. !19248 (nuwe1)
+## 12.4.8
+
+- No changes.
+
 ## 12.4.5
 - No changes.

app/assets/javascripts/vue_shared/components/bar_chart.vue

@@ -124,9 +124,7 @@ export default {
     },
   },
   mounted() {
-    if (!this.allValuesEmpty) {
-      this.draw();
-    }
+    this.draw();
   },
   methods: {
     draw() {
@@ -153,7 +151,14 @@ export default {
       this.yScale = d3.scaleLinear().rangeRound([this.vbHeight, 0]);
       this.xScale.domain(this.graphData.map(d => d.name));
-      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value))]);
+      /*
+      If we have all-zero graph we want graph to center 0 on axis and not to draw
+      any kind of ticks on Y axis. Infinity allows us to do that.
+
+      See https://gitlab.com/gitlab-org/gitlab/merge_requests/20627#note_251484582
+      for detailed explanation
+      */
+      this.yScale.domain([0, d3.max(this.graphData.map(d => d.value)) || Infinity]);
       // Zoom/Panning Function
       this.zoom = d3

app/finders/merge_requests_finder.rb

@@ -39,6 +39,7 @@ class MergeRequestsFinder < IssuableFinder
   def filter_items(_items)
     items = by_commit(super)
+    items = by_deployment(items)
     items = by_source_branch(items)
     items = by_wip(items)
     items = by_target_branch(items)
@@ -101,6 +102,17 @@ class MergeRequestsFinder < IssuableFinder
         .or(table[:title].matches('WIP %'))
         .or(table[:title].matches('[WIP]%'))
   end
+
+  def by_deployment(items)
+    return items unless deployment_id
+
+    items.includes(:deployment_merge_requests)
+         .where(deployment_merge_requests: { deployment_id: deployment_id })
+  end
+
+  def deployment_id
+    @deployment_id ||= params[:deployment_id].presence
+  end
 end
 MergeRequestsFinder.prepend_if_ee('EE::MergeRequestsFinder')

app/models/application_setting.rb

@@ -11,6 +11,7 @@ class ApplicationSetting < ApplicationRecord
   add_authentication_token_field :static_objects_external_storage_auth_token
   belongs_to :instance_administration_project, class_name: "Project"
+  belongs_to :instance_administrators_group, class_name: "Group"
   # Include here so it can override methods from
   # `add_authentication_token_field`

changelogs/unreleased/35739-add-mr-to-deployment-api.yml

+---
+title: Add API support for retrieving merge requests deployed in a deployment
+merge_request: 21837
+author:
+type: added

changelogs/unreleased/add-group-id-column.yml

+---
+title: Save Instance Administrators group ID in DB
+merge_request: 22600
+author:
+type: changed

changelogs/unreleased/ag-add-app-multi-logger.yml

+---
+title: Add structured logging for application logs
+merge_request: 22379
+author:
+type: other

changelogs/unreleased/error-tracking-api.yml

+---
+title: Add API for getting sentry error tracking settings of a project
+merge_request: 21788
+author: raju249
+type: added

changelogs/unreleased/pravi-gitlab-update-d3.yml

+---
+title: Update d3 to 5.12
+merge_request: 20627
+author: Praveen Arimbrathodiyil
+type: other

changelogs/unreleased/security-project-import-vn-master.yml

----
-title: Fix private objects exposure when using Project Import functionality
-merge_request:
-author:
-type: security

db/migrate/20200103190741_add_column_for_instance_administrators_group.rb

+# frozen_string_literal: true
+
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddColumnForInstanceAdministratorsGroup < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :application_settings, :instance_administrators_group_id, :integer
+  end
+end

db/migrate/20200103192859_add_fk_for_instance_administrators_group.rb

+# frozen_string_literal: true
+
+class AddFkForInstanceAdministratorsGroup < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key(
+      :application_settings,
+      :namespaces,
+      column: :instance_administrators_group_id,
+      on_delete: :nullify
+    )
+  end
+
+  def down
+    remove_foreign_key :application_settings, column: :instance_administrators_group_id
+  end
+end

db/migrate/20200103192914_add_index_for_instance_administrators_group.rb

+# frozen_string_literal: true
+
+class AddIndexForInstanceAdministratorsGroup < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :application_settings, :instance_administrators_group_id
+  end
+
+  def down
+    remove_concurrent_index :application_settings, :instance_administrators_group_id
+  end
+end

db/schema.rb

@@ -365,9 +365,11 @@ ActiveRecord::Schema.define(version: 2020_01_08_233040) do
     t.text "encrypted_slack_app_verification_token"
     t.string "encrypted_slack_app_verification_token_iv", limit: 255
     t.boolean "updating_name_disabled_for_users", default: false, null: false
+    t.integer "instance_administrators_group_id"
     t.index ["custom_project_templates_group_id"], name: "index_application_settings_on_custom_project_templates_group_id"
     t.index ["file_template_project_id"], name: "index_application_settings_on_file_template_project_id"
     t.index ["instance_administration_project_id"], name: "index_applicationsettings_on_instance_administration_project_id"
+    t.index ["instance_administrators_group_id"], name: "index_application_settings_on_instance_administrators_group_id"
     t.index ["usage_stats_set_by_user_id"], name: "index_application_settings_on_usage_stats_set_by_user_id"
   end
@@ -4414,6 +4416,7 @@ ActiveRecord::Schema.define(version: 2020_01_08_233040) do
   add_foreign_key "analytics_repository_file_edits", "projects", on_delete: :cascade
   add_foreign_key "analytics_repository_files", "projects", on_delete: :cascade
   add_foreign_key "application_settings", "namespaces", column: "custom_project_templates_group_id", on_delete: :nullify
+  add_foreign_key "application_settings", "namespaces", column: "instance_administrators_group_id", name: "fk_e8a145f3a7", on_delete: :nullify
   add_foreign_key "application_settings", "projects", column: "file_template_project_id", name: "fk_ec757bd087", on_delete: :nullify
   add_foreign_key "application_settings", "projects", column: "instance_administration_project_id", on_delete: :nullify
   add_foreign_key "application_settings", "users", column: "usage_stats_set_by_user_id", name: "fk_964370041d", on_delete: :nullify

doc/api/api_resources.md

@@ -29,6 +29,7 @@ The following API resources are available in the project context:
 | [Deployments](deployments.md)                                       | `/projects/:id/deployments`                                                                                                                                                                           |
 | [Discussions](discussions.md) (threaded comments)                   | `/projects/:id/issues/.../discussions`, `/projects/:id/snippets/.../discussions`, `/projects/:id/merge_requests/.../discussions`, `/projects/:id/commits/.../discussions` (also available for groups) |
 | [Environments](environments.md)                                     | `/projects/:id/environments`                                                                                                                                                                          |
+| [Error Tracking](error_tracking.md)                        | `/projects/:id/error_tracking/settings`                                                                                                                                                |
 | [Events](events.md)                                                 | `/projects/:id/events` (also available for users and standalone)                                                                                                                                      |
 | [Issues](issues.md)                                                 | `/projects/:id/issues` (also available for groups and standalone)                                                                                                                                     |
 | [Issues Statistics](issues_statistics.md)                           | `/projects/:id/issues_statistics` (also available for groups and standalone)                                                                                                                          |

doc/api/deployments.md

@@ -349,3 +349,19 @@ Example of a response:
   "deployable": null
 }
 ```
+
+## List of merge requests associated with a deployment
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/35739) in GitLab 12.7.
+
+This API retrieves the list of merge requests shipped with a given deployment:
+
+```
+GET /projects/:id/deployments/:deployment_id/merge_requests
+```
+
+It supports the same parameters as the [Merge Requests API](./merge_requests.md#list-merge-requests) and will return a response using the same format:
+
+```bash
+curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/deployments/42"
+```

doc/api/error_tracking.md

+# Error Tracking settings API
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/34940) in GitLab 12.7.
+
+## Error Tracking project settings
+
+The project settings API allows you to retrieve the Error Tracking settings for a project. Only for project maintainers.
+
+### Get Error Tracking settings
+
+```
+GET /projects/:id/error_tracking/settings
+```
+
+| Attribute | Type    | Required | Description           |
+| --------- | ------- | -------- | --------------------- |
+| `id`      | integer | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user |
+
+```bash
+curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/error_tracking/settings
+```
+
+Example response:
+
+```json
+{
+  "project_name": "sample sentry project",
+  "sentry_external_url": "https://sentry.io/myawesomeproject/project",
+  "api_url": "https://sentry.io/api/0/projects/myawesomeproject/project"
+}
+```

doc/api/merge_requests.md

@@ -550,7 +550,7 @@ Parameters:
   },
   "user" : {
     "can_merge" : false
-   }
+  },
   "assignee": {
     "id": 1,
     "name": "Administrator",

doc/development/logging.md

@@ -127,6 +127,88 @@ importer progresses. Here's what to do:
    logger.info(message: "Import error", error_code: 1, error: "I/O failure")
    ```
+## Multi-destination Logging
+
+GitLab is transitioning from unstructured/plaintext logs to structured/JSON logs.  During this transition period some logs will be recorded in multiple formats through multi-destination logging.
+
+### How to use multi-destination logging
+
+Create a new logger class, inheriting from `MultiDestinationLogger` and add an array of loggers to a `LOGGERS` constant. The loggers should be classes that descend from `Gitlab::Logger`. e.g. the user defined loggers in the following examples, could be inheriting from `Gitlab::Logger` and `Gitlab::JsonLogger`, respectively.
+
+You must specify one of the loggers as the `primary_logger`. The `primary_logger` will be used when information about this multi-destination logger is displayed in the app, e.g. using the `Gitlab::Logger.read_latest` method.
+
+The following example sets one of the defined `LOGGERS` as a `primary_logger`.
+
+```ruby
+module Gitlab
+  class FancyMultiLogger < Gitlab::MultiDestinationLogger
+    LOGGERS = [UnstructuredLogger, StructuredLogger].freeze
+
+    def self.loggers
+      LOGGERS
+    end
+
+    def primary_logger
+      UnstructuredLogger
+    end
+  end
+end
+```
+
+You can now call the usual logging methods on this multi-logger, e.g.
+
+```ruby
+FancyMultiLogger.info(message: "Information")
+```
+
+This message will be logged by each logger registered in `FancyMultiLogger.loggers`.
+
+### Passing a string or hash for logging
+
+When passing a string or hash to a `MultiDestinationLogger`, the log lines could be formatted differently, depending on the kinds of `LOGGERS` set.
+
+e.g. let's partially define the loggers from the previous example:
+
+```ruby
+module Gitlab
+  # Similar to AppTextLogger
+  class UnstructuredLogger < Gitlab::Logger
+    ...
+  end
+
+  # Similar to AppJsonLogger
+  class StructuredLogger < Gitlab::JsonLogger
+    ...
+  end
+end
+```
+
+Here are some examples of how messages would be handled by both the loggers.
+
+1. When passing a string
+
+```ruby
+FancyMultiLogger.info("Information")
+
+# UnstructuredLogger
+I, [2020-01-13T12:02:41.566219 #6652]  INFO -- : Information
+
+# StructuredLogger
+{:severity=>"INFO", :time=>"2020-01-13T11:02:41.559Z", :correlation_id=>"b1701f7ecc4be4bcd4c2d123b214e65a", :message=>"Information"}
+```
+
+1. When passing a hash
+
+```ruby
+FancyMultiLogger.info({:message=>"This is my message", :project_id=>123})
+
+# UnstructuredLogger
+I, [2020-01-13T12:06:09.856766 #8049]  INFO -- : {:message=>"This is my message", :project_id=>123}
+
+# StructuredLogger
+{:severity=>"INFO", :time=>"2020-01-13T11:06:09.851Z", :correlation_id=>"d7e0886f096db9a8526a4f89da0e45f6", :message=>"This is my message", :project_id=>123}
+```
+
 ## Exception Handling
 It often happens that you catch the exception and want to track it.

doc/development/testing_guide/end_to_end/index.md

@@ -34,8 +34,8 @@ a pipeline in the [`gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/) projec
 by triggering the `package-and-qa` manual action in the `test` stage (not
 available for forks).
-**This runs end-to-end tests against a custom Omnibus package built from your
-merge request's changes.**
+**This runs end-to-end tests against a custom CE and EE (with an Ultimate license)
+Omnibus package built from your merge request's changes.**
 Manual action that starts end-to-end tests is also available in merge requests
 in [Omnibus GitLab][omnibus-gitlab].