From 74b5b3ffcb9fe4d9424bc2bf35e43f749f76d023 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 19 Aug 2020 15:09:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../stylesheets/fontawesome_custom.scss | 4 ---- app/helpers/icons_helper.rb | 2 +- ...-off-icon-with-gitlab-svg-power-icon-2.yml | 5 +++++ ...add-migration-to-import-common-metrics.yml | 5 +++++ ...0813153434_import_latest_common_metrics.rb | 22 +++++++++++++++++++ db/schema_migrations/20200813153434 | 1 + .../geo/replication/geo_validation_tests.md | 13 +++++++++++ doc/user/application_security/index.md | 9 ++++---- .../integrations/mattermost_slash_commands.md | 6 ++--- package.json | 2 +- yarn.lock | 8 +++---- 11 files changed, 60 insertions(+), 17 deletions(-) create mode 100644 changelogs/unreleased/225889-replace-fa-power-off-icon-with-gitlab-svg-power-icon-2.yml create mode 100644 changelogs/unreleased/rpereira2-add-migration-to-import-common-metrics.yml create mode 100644 db/post_migrate/20200813153434_import_latest_common_metrics.rb create mode 100644 db/schema_migrations/20200813153434 diff --git a/app/assets/stylesheets/fontawesome_custom.scss b/app/assets/stylesheets/fontawesome_custom.scss index cf08f1778f1..a2117e9c012 100644 --- a/app/assets/stylesheets/fontawesome_custom.scss +++ b/app/assets/stylesheets/fontawesome_custom.scss @@ -250,10 +250,6 @@ content: '\f06d'; } -.fa-power-off::before { - content: '\f011'; -} - .fa-download::before { content: '\f019'; } diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 7376b92f111..9957d5c6330 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -102,7 +102,7 @@ module IconsHelper if value icon('circle', class: 'cgreen') else - icon('power-off', class: 'clgray') + sprite_icon('power', css_class: 'clgray') end end diff --git a/changelogs/unreleased/225889-replace-fa-power-off-icon-with-gitlab-svg-power-icon-2.yml b/changelogs/unreleased/225889-replace-fa-power-off-icon-with-gitlab-svg-power-icon-2.yml new file mode 100644 index 00000000000..2e8a8b7ec49 --- /dev/null +++ b/changelogs/unreleased/225889-replace-fa-power-off-icon-with-gitlab-svg-power-icon-2.yml @@ -0,0 +1,5 @@ +--- +title: Replace fa-power-off icon with GitLab SVG power icon +merge_request: 39330 +author: +type: changed diff --git a/changelogs/unreleased/rpereira2-add-migration-to-import-common-metrics.yml b/changelogs/unreleased/rpereira2-add-migration-to-import-common-metrics.yml new file mode 100644 index 00000000000..957c1b686ed --- /dev/null +++ b/changelogs/unreleased/rpereira2-add-migration-to-import-common-metrics.yml @@ -0,0 +1,5 @@ +--- +title: Import the new queries in common_metrics.yml into database +merge_request: 39475 +author: +type: changed diff --git a/db/post_migrate/20200813153434_import_latest_common_metrics.rb b/db/post_migrate/20200813153434_import_latest_common_metrics.rb new file mode 100644 index 00000000000..203e495674f --- /dev/null +++ b/db/post_migrate/20200813153434_import_latest_common_metrics.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class ImportLatestCommonMetrics < ActiveRecord::Migration[6.0] + DOWNTIME = false + + def up + # The common_metrics queries were updated to work with K8s versions that + # use the pod/container label names as well as K8s versions that use the + # older pod_name/container_name convention. + ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute + end + + def down + # no-op + # The import cannot be reversed since we do not know the state that the + # common metrics in the PrometheusMetric table were in before the import. + + # To manually revert this migration. + # 1. Go back to the previous version of the config/prometheus/common_metrics.yml file. (git checkout 74447f11349617ed8b273196d6a5781d9a67a613) + # 2. Execute `rails runner '::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute'` + end +end diff --git a/db/schema_migrations/20200813153434 b/db/schema_migrations/20200813153434 new file mode 100644 index 00000000000..ca7c154abb7 --- /dev/null +++ b/db/schema_migrations/20200813153434 @@ -0,0 +1 @@ +23de9421726337f5279bf434542bffda24cbadc7324b498ff642ec4c0883b5d5 \ No newline at end of file diff --git a/doc/administration/geo/replication/geo_validation_tests.md b/doc/administration/geo/replication/geo_validation_tests.md index fef735badf0..323f6f367b1 100644 --- a/doc/administration/geo/replication/geo_validation_tests.md +++ b/doc/administration/geo/replication/geo_validation_tests.md @@ -114,6 +114,19 @@ The following are GitLab upgrade validation tests we performed. The following are PostgreSQL upgrade validation tests we performed. +### August 2020 + +[Verify Geo installation with PostgreSQL 12](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5453): + +- Description: Prior to PostgreSQL 12 becoming available as an opt-in version in GitLab 13.3, + we tested fresh installations of GitLab 13.3 with PostgreSQL 12 enabled and Geo installed. +- Outcome: Setting up a Geo secondary required manual intervention because the `recovery.conf` file + is no longer supported in PostgreSQL 12. We do not recommend deploying Geo with PostgreSQL 12 until + the appropriate changes have been made to Omnibus and verified. +- Follow up issues: + - [Update `replicate-geo-database` to support PostgreSQL 12](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5575) + - [Remove PostgreSQL 12 check in `replicate-geo-database` for 14.0](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5576) + ### April 2020 [PostgreSQL 11 upgrade procedure for Geo installations](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4975): diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md index ded72021cc4..c003b512808 100644 --- a/doc/user/application_security/index.md +++ b/doc/user/application_security/index.md @@ -321,14 +321,15 @@ Once this group is added to your project, the approval rule is enabled for all m Any code changes cause the approvals required to reset. -An approval is required when a security report: +An approval is required when the latest security report in a merge request: -- Contains a new vulnerability of `high`, `critical`, or `unknown` severity, regardless of dismissal. +- Contains a vulnerability of `high`, `critical`, or `unknown` severity that is not present in the + target branch. Note that approval is still required for dismissed vulnerabilities. - Is not generated during pipeline execution. -An approval is optional when a security report: +An approval is optional when the security report: -- Contains no new vulnerabilities. +- Contains no new vulnerabilities when compared to the target branch. - Contains only new vulnerabilities of `low` or `medium` severity. ## Enabling License Approvals within a project diff --git a/doc/user/project/integrations/mattermost_slash_commands.md b/doc/user/project/integrations/mattermost_slash_commands.md index a392b20ee41..5e08767d3f0 100644 --- a/doc/user/project/integrations/mattermost_slash_commands.md +++ b/doc/user/project/integrations/mattermost_slash_commands.md @@ -48,9 +48,9 @@ the administrator console. ![Mattermost go to console](img/mattermost_goto_console.png) -1. Click **Custom integrations** and set **Enable Custom Slash Commands**, - **Enable custom integrations to override usernames**, and **Override - custom integrations to override profile picture icons** to true +1. Click **Integration Management** and set **Enable Custom Slash Commands**, + **Enable integrations to override usernames**, and **Enable + integrations to override profile picture icons** to true ![Mattermost console](img/mattermost_console_integrations.png) diff --git a/package.json b/package.json index 15aba484c7b..99dd3a819b7 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ }, "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.10.1", - "@gitlab/eslint-plugin": "3.1.0", + "@gitlab/eslint-plugin": "3.2.0", "@testing-library/dom": "^7.16.2", "@vue/test-utils": "1.0.0-beta.30", "acorn": "^6.3.0", diff --git a/yarn.lock b/yarn.lock index e49e362649d..068513341c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -827,10 +827,10 @@ resolved "https://registry.yarnpkg.com/@gitlab/at.js/-/at.js-1.5.5.tgz#5f6bfe6baaef360daa9b038fa78798d7a6a916b4" integrity sha512-282Dn3SPVsUHVDhMsXgfnv+Rzog0uxecjttxGRQvxh25es1+xvkGQFsvJfkSKJ3X1kHVkSjKf+Tt5Rra+Jhp9g== -"@gitlab/eslint-plugin@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.1.0.tgz#18e03630d10788defbb4c2d746620aec09517295" - integrity sha512-M5bCk5vD0d65COeYtWoc7p43bvvsT9885t6DONI7q5aQVg7GBk3J4on8XjnWTLI4dFZNQGS6aw8+PkRD8NqByQ== +"@gitlab/eslint-plugin@3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-3.2.0.tgz#e1780c2cab4c206e4900f2a1a4cf636f788182ea" + integrity sha512-3s28sQoGMgmwKtmVij7TjBDdW6fHiP4k6k6FWZdU6XZBJFwwA0JlU8PzYZRRTyY+pYed2u1jF06LHzv5YWNS2g== dependencies: babel-eslint "^10.0.3" eslint-config-airbnb-base "^14.0.0"