Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/error_tracking/components/constants.js

+export const severityLevel = {
+  FATAL: 'fatal',
+  ERROR: 'error',
+  WARNING: 'warning',
+  INFO: 'info',
+  DEBUG: 'debug',
+};
+
+export const severityLevelVariant = {
+  [severityLevel.FATAL]: 'danger',
+  [severityLevel.ERROR]: 'dark',
+  [severityLevel.WARNING]: 'warning',
+  [severityLevel.INFO]: 'info',
+  [severityLevel.DEBUG]: 'light',
+};

app/assets/javascripts/error_tracking/components/error_details.vue

@@ -11,6 +11,7 @@ import Stacktrace from './stacktrace.vue';
 import TrackEventDirective from '~/vue_shared/directives/track_event';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 import { trackClickErrorLinkToSentryOptions } from '../utils';
+import { severityLevel, severityLevelVariant } from './constants';
 import query from '../queries/details.query.graphql';
@@ -147,6 +148,11 @@ export default {
     errorLevel() {
       return sprintf(__('level: %{level}'), { level: this.error.tags.level });
     },
+    errorSeverityVariant() {
+      return (
+        severityLevelVariant[this.error.tags.level] || severityLevelVariant[severityLevel.ERROR]
+      );
+    },
   },
   mounted() {
     this.startPollingDetails(this.issueDetailsPath);
@@ -228,8 +234,12 @@ export default {
           <h2 class="text-truncate">{{ GQLerror.title }}</h2>
         </tooltip-on-truncate>
         <template v-if="error.tags">
-          <gl-badge v-if="error.tags.level" variant="danger" class="rounded-pill mr-2"
-            >{{ errorLevel }}
+          <gl-badge
+            v-if="error.tags.level"
+            :variant="errorSeverityVariant"
+            class="rounded-pill mr-2"
+          >
+            {{ errorLevel }}
           </gl-badge>
           <gl-badge v-if="error.tags.logger" variant="light" class="rounded-pill"
             >{{ error.tags.logger }}

app/assets/javascripts/registry/settings/components/settings_form.vue

@@ -174,7 +174,9 @@ export default {
           :label-cols="$options.labelsConfig.cols"
           :label-align="$options.labelsConfig.align"
           label-for="expiration-policy-name-matching"
-          :label="s__('ContainerRegistry|Expire Docker tags that match this regex:')"
+          :label="
+            s__('ContainerRegistry|Docker tags with names matching this regex pattern will expire:')
+          "
           :state="nameRegexState"
           :invalid-feedback="
             s__('ContainerRegistry|The value of this input should be less than 255 characters')

app/models/clusters/applications/ingress.rb

@@ -3,7 +3,7 @@
 module Clusters
   module Applications
     class Ingress < ApplicationRecord
-      VERSION = '1.22.1'
+      VERSION = '1.29.3'
       MODSECURITY_LOG_CONTAINER_NAME = 'modsecurity-log'
       self.table_name = 'clusters_applications_ingress'

app/models/project_services/jira_service.rb

@@ -194,7 +194,7 @@ class JiraService < IssueTrackerService
   def test(_)
     result = test_settings
     success = result.present?
-    result = @error if @error && !success
+    result = @error&.message unless success
     { success: success, result: result }
   end
@@ -205,6 +205,8 @@ class JiraService < IssueTrackerService
     nil
   end
+  private
+
   def test_settings
     return unless client_url.present?
@@ -212,8 +214,6 @@ class JiraService < IssueTrackerService
     jira_request { client.ServerInfo.all.attrs }
   end
-  private
-
   def can_cross_reference?(noteable)
     case noteable
     when Commit then commit_events
@@ -346,9 +346,17 @@ class JiraService < IssueTrackerService
   # Handle errors when doing Jira API calls
   def jira_request
     yield
-  rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => e
-    @error = e.message
-    log_error("Error sending message", client_url: client_url, error: @error)
+  rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => error
+    @error = error
+    log_error(
+      "Error sending message",
+      client_url: client_url,
+      error: {
+        exception_class: error.class.name,
+        exception_message: error.message,
+        exception_backtrace: error.backtrace.join("\n")
+      }
+    )
     nil
   end

changelogs/unreleased/196765-bump-ingress-to-1-29.yml

+---
+title: Bump ingress managed app chart to 1.29.3
+merge_request: 23461
+author:
+type: changed

changelogs/unreleased/198411-more-verbose-jira-error-logs.yml

+---
+title: More verbose JiraService error logs
+merge_request: 23688
+author:
+type: other

changelogs/unreleased/39075-error-level-color.yml

+---
+title: Indicate Sentry error severity in GitLab
+merge_request: 23346
+author:
+type: added

changelogs/unreleased/refactoring-entities-file-4.yml

+---
+title: Add separate classes for project hook, identity, export status
+merge_request: 23789
+author: Rajendra Kadam
+type: added

config/initializers/console_message.rb

 # rubocop:disable Rails/Output
-if defined?(Rails::Console)
-  # note that this will not print out when using `spring`
+if defined?(Rails::Console) || Rails.env.development?
+  # when using `spring` this will only print out the first time
   justify = 15
   puts '-' * 80
-  puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision})"
+  puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision}) #{Gitlab.ee? ? 'EE' : 'FOSS'}"
   puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
   puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version

doc/integration/elasticsearch.md

@@ -611,6 +611,15 @@ Here are some common pitfalls and how to overcome them:
     }
   }'
   ```
+  
+- **I'm getting a `health check timeout: no Elasticsearch node available` error in Sidekiq during the indexing process**
+
+   ```
+   Gitlab::Elastic::Indexer::Error: time="2020-01-23T09:13:00Z" level=fatal msg="health check timeout: no Elasticsearch node available"
+   ```
+
+   You probably have not used either `http://` or `https://` as part of your value in the **"URL"** field of the Elasticseach Integration Menu. Please make sure you are using either `http://` or `https://` in this field as the [Elasticsearch client for Go](https://github.com/olivere/elastic) that we are using [needs the prefix for the URL to be acceped as valid](https://github.com/olivere/elastic/commit/a80af35aa41856dc2c986204e2b64eab81ccac3a).
+   Once you have corrected the formatting of the URL please delete the index (via the [dedicated rake task](#gitlab-elasticsearch-rake-tasks)) and [index the content of your intance](#adding-gitlabs-data-to-the-elasticsearch-index) once more.
 ### Reverting to basic search

doc/user/application_security/license_compliance/index.md

@@ -179,9 +179,10 @@ If you still need to run tests during `mvn install`, add `-DskipTests=false` to
 ### Selecting the version of Python
 > - [Introduced](https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/36) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0.
-> - In GitLab 12.2, Python 3.5 became the default.
-License Compliance uses Python 3.5 and pip 19.1 by default.
+> - In [GitLab 12.2](https://gitlab.com/gitlab-org/gitlab/issues/12032), Python 3.5 became the default.
+> - In [GitLab 12.7](https://gitlab.com/gitlab-org/security-products/license-management/merge_requests/101), Python 3.8 became the default.
+License Compliance uses Python 3.8 and pip 19.1 by default.
 If your project requires Python 2, you can switch to Python 2.7 and pip 10.0
 by setting the `LM_PYTHON_VERSION` environment variable to `2`.

doc/user/packages/container_registry/index.md

@@ -177,7 +177,7 @@ The UI allows you to configure the following:
 - **Expiration interval:** how long tags are exempt from being deleted.
 - **Expiration schedule:** how often the cron job checking the tags should run.
 - **Expiration latest:** how many tags to _always_ keep for each image.
-- **Expire Docker tags with regex matching:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`.
+- **Docker tags with names matching this regex pattern will expire:** the regex used to determine what tags should be expired. To qualify all tags for expiration, use the default value of `.*`.
 ## Troubleshooting the GitLab Container Registry

lib/api/entities.rb

@@ -2,52 +2,6 @@
 module API
   module Entities
-    class Hook < Grape::Entity
-      expose :id, :url, :created_at, :push_events, :tag_push_events, :merge_requests_events, :repository_update_events
-      expose :enable_ssl_verification
-    end
-
-    class ProjectHook < Hook
-      expose :project_id, :issues_events, :confidential_issues_events
-      expose :note_events, :confidential_note_events, :pipeline_events, :wiki_page_events
-      expose :job_events
-      expose :push_events_branch_filter
-    end
-
-    class SharedGroup < Grape::Entity
-      expose :group_id
-      expose :group_name do |group_link, options|
-        group_link.group.name
-      end
-      expose :group_full_path do |group_link, options|
-        group_link.group.full_path
-      end
-      expose :group_access, as: :group_access_level
-      expose :expires_at
-    end
-
-    class ProjectIdentity < Grape::Entity
-      expose :id, :description
-      expose :name, :name_with_namespace
-      expose :path, :path_with_namespace
-      expose :created_at
-    end
-
-    class ProjectExportStatus < ProjectIdentity
-      include ::API::Helpers::RelatedResourcesHelpers
-
-      expose :export_status
-      expose :_links, if: lambda { |project, _options| project.export_status == :finished } do
-        expose :api_url do |project|
-          expose_url(api_v4_projects_export_download_path(id: project.id))
-        end
-
-        expose :web_url do |project|
-          Gitlab::Routing.url_helpers.download_export_project_url(project)
-        end
-      end
-    end
-
     class RemoteMirror < Grape::Entity
       expose :id
       expose :enabled

lib/api/entities/hook.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class Hook < Grape::Entity
+      expose :id, :url, :created_at, :push_events, :tag_push_events, :merge_requests_events, :repository_update_events
+      expose :enable_ssl_verification
+    end
+  end
+end

lib/api/entities/project_export_status.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectExportStatus < ProjectIdentity
+      include ::API::Helpers::RelatedResourcesHelpers
+
+      expose :export_status
+      expose :_links, if: lambda { |project, _options| project.export_status == :finished } do
+        expose :api_url do |project|
+          expose_url(api_v4_projects_export_download_path(id: project.id))
+        end
+
+        expose :web_url do |project|
+          Gitlab::Routing.url_helpers.download_export_project_url(project)
+        end
+      end
+    end
+  end
+end

lib/api/entities/project_hook.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectHook < Hook
+      expose :project_id, :issues_events, :confidential_issues_events
+      expose :note_events, :confidential_note_events, :pipeline_events, :wiki_page_events
+      expose :job_events
+      expose :push_events_branch_filter
+    end
+  end
+end

lib/api/entities/project_identity.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class ProjectIdentity < Grape::Entity
+      expose :id, :description
+      expose :name, :name_with_namespace
+      expose :path, :path_with_namespace
+      expose :created_at
+    end
+  end
+end

lib/api/entities/shared_group.rb

+# frozen_string_literal: true
+
+module API
+  module Entities
+    class SharedGroup < Grape::Entity
+      expose :group_id
+      expose :group_name do |group_link, options|
+        group_link.group.name
+      end
+      expose :group_full_path do |group_link, options|
+        group_link.group.full_path
+      end
+      expose :group_access, as: :group_access_level
+      expose :expires_at
+    end
+  end
+end