From 73b652cf4f890e91868055df8f76e6f869dd710d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Dec 2021 12:10:49 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/views/admin/users/_user_detail.html.haml | 20 ----- .../reference_architectures/index.md | 2 +- doc/development/fe_guide/vue.md | 4 +- doc/install/requirements.md | 2 +- doc/integration/openid_connect_provider.md | 8 ++ doc/update/zero_downtime.md | 2 +- locale/gitlab.pot | 6 -- qa/qa/page/admin/overview/users/index.rb | 4 - scripts/review_apps/review-apps.sh | 6 +- spec/scripts/lib/gitlab_spec.rb | 81 ------------------- 10 files changed, 16 insertions(+), 119 deletions(-) delete mode 100644 app/views/admin/users/_user_detail.html.haml delete mode 100644 spec/scripts/lib/gitlab_spec.rb diff --git a/app/views/admin/users/_user_detail.html.haml b/app/views/admin/users/_user_detail.html.haml deleted file mode 100644 index 05e387e6479..00000000000 --- a/app/views/admin/users/_user_detail.html.haml +++ /dev/null @@ -1,20 +0,0 @@ -.flex-list - .flex-row - = image_tag avatar_icon_for_user(user), class: 'avatar s32 d-none d-md-flex', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) } - .row-main-content - .row-title.str-truncated-100 - = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 gl-mt-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) } - = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id, qa_selector: 'username_link' } - - = render 'admin/users/user_listing_note', user: user - - - user_badges_in_admin_section(user).each do |badge| - - css_badge = "badge gl-badge sm badge-pill badge-#{badge[:variant]}" if badge[:variant].present? - %span.px-1.py-1 - %span{ class: css_badge } - = badge[:text] - - .row-second-line.str-truncated-100 - = mail_to user.email, user.email, class: 'text-secondary' - - unless Feature.disabled?(:security_auto_fix) || !user.internal? || user.website_url.blank? - = link_to "(#{_('more information')})", user.website_url diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md index 4d95a61176b..d4b4bdf11f4 100644 --- a/doc/administration/reference_architectures/index.md +++ b/doc/administration/reference_architectures/index.md @@ -166,7 +166,7 @@ that can also be promoted in case of disaster. ## Deviating from the suggested reference architectures -As a general rule of thumb, the further away you move from the Reference Architectures, +As a general guideline, the further away you move from the Reference Architectures, the harder it will be get support for it. With any deviation, you're introducing a layer of complexity that will add challenges to finding out where potential issues might lie. diff --git a/doc/development/fe_guide/vue.md b/doc/development/fe_guide/vue.md index ab808e6f1b7..b947d90cc11 100644 --- a/doc/development/fe_guide/vue.md +++ b/doc/development/fe_guide/vue.md @@ -308,7 +308,7 @@ This folder holds all components that are specific to this new feature. If you need to use or create a component that is likely to be used somewhere else, please refer to `vue_shared/components`. -A good rule of thumb to know when you should create a component is to think if +A good guideline to know when you should create a component is to think if it could be reusable elsewhere. For example, tables are used in a quite amount of places across GitLab, a table @@ -336,7 +336,7 @@ In the [Vue documentation](https://vuejs.org/v2/api/#Options-Data) the Data func > The data object for the Vue instance. Vue recursively converts its properties into getter/setters to make it "reactive". The object must be plain: native objects such as browser API objects and -prototype properties are ignored. A rule of thumb is that data should just be data - it is not +prototype properties are ignored. A guideline is that data should just be data - it is not recommended to observe objects with their own stateful behavior. Based on the Vue guidance: diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 8aa7ca511c4..037fbd7063d 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -57,7 +57,7 @@ Redis version 6.0 or higher is recommended, as this is what ships with ### Storage -The necessary hard drive space largely depends on the size of the repositories you want to store in GitLab but as a *rule of thumb* you should have at least as much free space as all your repositories combined take up. +The necessary hard drive space largely depends on the size of the repositories you want to store in GitLab but as a *guideline* you should have at least as much free space as all your repositories combined take up. The Omnibus GitLab package requires about 2.5 GB of storage space for installation. diff --git a/doc/integration/openid_connect_provider.md b/doc/integration/openid_connect_provider.md index 7d810100193..54d4a5b6bb7 100644 --- a/doc/integration/openid_connect_provider.md +++ b/doc/integration/openid_connect_provider.md @@ -33,6 +33,14 @@ Refer to the [OAuth guide](oauth_provider.md) for basic information on how to se applications in GitLab. To enable OIDC for an application, all you have to do is select the `openid` scope in the application settings. +## Settings discovery + +If your client allows importing OIDC settings from a discovery URL, you can use the following URL to automatically find the correct settings: + +```plaintext +https://gitlab.example.com/.well-known/openid-configuration +``` + ## Shared information The following user information is shared with clients: diff --git a/doc/update/zero_downtime.md b/doc/update/zero_downtime.md index 244b558d375..13658e6071b 100644 --- a/doc/update/zero_downtime.md +++ b/doc/update/zero_downtime.md @@ -56,7 +56,7 @@ increasing the number of Sidekiq workers that can process jobs in the `background_migration` queue. To see the size of this queue, [Check for background migrations before upgrading](index.md#checking-for-background-migrations-before-upgrading). -As a rule of thumb, any database smaller than 10 GB doesn't take too much time to +As a guideline, any database smaller than 10 GB doesn't take too much time to upgrade; perhaps an hour at most per minor release. Larger databases however may require more time, but this is highly dependent on the size of the database and the migrations that are being performed. diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d659f46906d..f9dab340bb1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5181,9 +5181,6 @@ msgstr "" msgid "Avatar for %{assigneeName}" msgstr "" -msgid "Avatar for %{name}" -msgstr "" - msgid "Avatar will be removed. Are you sure?" msgstr "" @@ -41888,9 +41885,6 @@ msgstr "" msgid "missing" msgstr "" -msgid "more information" -msgstr "" - msgid "most recent deployment" msgstr "" diff --git a/qa/qa/page/admin/overview/users/index.rb b/qa/qa/page/admin/overview/users/index.rb index 8a2c2303ff7..2ad45e4a0fa 100644 --- a/qa/qa/page/admin/overview/users/index.rb +++ b/qa/qa/page/admin/overview/users/index.rb @@ -15,10 +15,6 @@ module QA element :user_row_content end - view 'app/views/admin/users/_user_detail.html.haml' do - element :username_link - end - def search_user(username) find_element(:user_search_field).set(username).send_keys(:return) end diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index c122cb0f90c..81ff1db9478 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -289,9 +289,9 @@ HELM_CMD=$(cat << EOF --set releaseOverride="${release}" \ --set global.hosts.hostSuffix="${HOST_SUFFIX}" \ --set global.hosts.domain="${REVIEW_APPS_DOMAIN}" \ - --set global.sentry.enabled="${sentry_enabled}" \ - --set global.sentry.dsn="${REVIEW_APPS_SENTRY_DSN}" \ - --set global.sentry.environment="review" \ + --set global.appConfig.sentry.enabled="${sentry_enabled}" \ + --set global.appConfig.sentry.dsn="${REVIEW_APPS_SENTRY_DSN}" \ + --set global.appConfig.sentry.environment="review" \ --set gitlab.migrations.image.repository="${gitlab_toolbox_image_repository}" \ --set gitlab.migrations.image.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.gitaly.image.repository="${gitlab_gitaly_image_repository}" \ diff --git a/spec/scripts/lib/gitlab_spec.rb b/spec/scripts/lib/gitlab_spec.rb deleted file mode 100644 index e8a01b4e03c..00000000000 --- a/spec/scripts/lib/gitlab_spec.rb +++ /dev/null @@ -1,81 +0,0 @@ -# frozen_string_literal: true - -require 'fast_spec_helper' -require_relative '../../../scripts/lib/gitlab' - -RSpec.describe 'scripts/lib/gitlab.rb' do - let(:ee_file_path) { File.expand_path('../../../ee/app/models/license.rb', __dir__) } - - describe '.ee?' do - before do - stub_env('FOSS_ONLY', nil) - allow(File).to receive(:exist?).with(ee_file_path) { true } - end - - it 'returns true when ee/app/models/license.rb exists' do - expect(Gitlab.ee?).to eq(true) - end - end - - describe '.jh?' do - context 'when jh directory exists and EE_ONLY is not set' do - before do - stub_env('EE_ONLY', nil) - - allow(Dir).to receive(:exist?).with(File.expand_path('../../../jh', __dir__)) { true } - end - - context 'when ee/app/models/license.rb exists' do - before do - allow(File).to receive(:exist?).with(ee_file_path) { true } - end - - context 'when FOSS_ONLY is not set' do - before do - stub_env('FOSS_ONLY', nil) - end - - it 'returns true' do - expect(Gitlab.jh?).to eq(true) - end - end - - context 'when FOSS_ONLY is set to 1' do - before do - stub_env('FOSS_ONLY', '1') - end - - it 'returns false' do - expect(Gitlab.jh?).to eq(false) - end - end - end - - context 'when ee/app/models/license.rb not exist' do - before do - allow(File).to receive(:exist?).with(ee_file_path) { false } - end - - context 'when FOSS_ONLY is not set' do - before do - stub_env('FOSS_ONLY', nil) - end - - it 'returns true' do - expect(Gitlab.jh?).to eq(false) - end - end - - context 'when FOSS_ONLY is set to 1' do - before do - stub_env('FOSS_ONLY', '1') - end - - it 'returns false' do - expect(Gitlab.jh?).to eq(false) - end - end - end - end - end -end