diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-17 03:09:21 +0300 |
commit | ce2a803dc413f289352deecbf2cfd32896c8b2ef (patch) | |
tree | a19f57942ed8d497298afb416fd48dcc9e68f5be | |
parent | cfaf1cca4403b826af2286b1ab0a69ad01c58738 (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | changelogs/unreleased/pin-auto-devops-dind-version.yml | 5 | ||||
-rw-r--r-- | doc/user/project/settings/index.md | 56 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml | 6 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml | 3 | ||||
-rw-r--r-- | lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml | 6 | ||||
-rw-r--r-- | rubocop/rubocop.rb | 67 |
6 files changed, 59 insertions, 84 deletions
diff --git a/changelogs/unreleased/pin-auto-devops-dind-version.yml b/changelogs/unreleased/pin-auto-devops-dind-version.yml new file mode 100644 index 00000000000..12c98957998 --- /dev/null +++ b/changelogs/unreleased/pin-auto-devops-dind-version.yml @@ -0,0 +1,5 @@ +--- +title: Pin Auto DevOps Docker-in-Docker service image to work around pull timeouts +merge_request: 25286 +author: +type: fixed diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md index 248c0e67520..158aaf143a9 100644 --- a/doc/user/project/settings/index.md +++ b/doc/user/project/settings/index.md @@ -110,13 +110,10 @@ Here you can run housekeeping, archive, rename, transfer, [remove a fork relatio #### Archiving a project -NOTE: **Note:** -Only project Owners and Admin users have the [permissions](../../permissions.md#project-members-permissions) -to archive a project. - -Archiving a project makes it read-only for all users and indicates that it is +Archiving a project makes it read-only for all users and indicates that it's no longer actively maintained. Projects that have been archived can also be -unarchived. +unarchived. Only project Owners and Admin users have the +[permissions](../../permissions.md#project-members-permissions) to archive a project. When a project is archived, the repository, issues, merge requests and all other features are read-only. Archived projects are also hidden @@ -124,8 +121,33 @@ in project listings. To archive a project: -1. Navigate to your project's **Settings > General > Advanced settings**. -1. In the Archive project section, click the **Archive project** button. +1. Navigate to your project's **{settings}** **Settings > General**. +1. Under **Advanced**, click **Expand**. +1. In the **Archive project** section, click the **Archive project** button. +1. Confirm the action when asked to. + +#### Unarchiving a project + +Unarchiving a project removes the read-only restriction on a project, and makes it +available in project listings. Only project Owners and Admin users have the +[permissions](../../permissions.md#project-members-permissions) to unarchive a project. + +To find an archived project: + +1. Sign in to GitLab as a user with project Owner or Admin permissions. +1. If you: + - Have the project's URL, open the project's page in your browser. + - Don't have the project's URL: + 1. Click **Projects > Explore projects**. + 1. In the **Sort projects** dropdown box, select **Show archived projects**. + 1. In the **Filter by name** field, provide the project's name. + 1. Click the link to the project to open its **Details** page. + +Next, to unarchive the project: + +1. Navigate to your project's **{settings}** **Settings > General**. +1. Under **Advanced**, click **Expand**. +1. In the **Unarchive project** section, click the **Unarchive project** button. 1. Confirm the action when asked to. #### Renaming a repository @@ -140,12 +162,13 @@ project via a browser) and its place on the file disk where GitLab is installed. To rename a repository: -1. Navigate to your project's **Settings > General > Advanced settings**. +1. Navigate to your project's **{settings}** **Settings > General**. +1. Under **Advanced**, click **Expand**. 1. Under "Rename repository", change the "Path" to your liking. 1. Hit **Rename project**. Remember that this can have unintended side effects since everyone with the -old URL will not be able to push or pull. Read more about what happens with the +old URL won't be able to push or pull. Read more about what happens with the [redirects when renaming repositories](../index.md#redirects-when-changing-repository-paths). #### Transferring an existing project into another namespace @@ -158,13 +181,14 @@ You can transfer an existing project into a [group](../../group/index.md) if: 1. You have at least **Maintainer** [permissions](../../permissions.md#project-members-permissions) to that group. 1. The project is in a subgroup you own. -1. You are at least a **Maintainer** of the project under your personal namespace. - Similarly, if you are an owner of a group, you can transfer any of its projects +1. You're at least a **Maintainer** of the project under your personal namespace. + Similarly, if you're an owner of a group, you can transfer any of its projects under your own user. To transfer a project: -1. Navigate to your project's **Settings > General > Advanced settings**. +1. Navigate to your project's **{settings}** **Settings > General**. +1. Under **Advanced**, click **Expand**. 1. Under "Transfer project", choose the namespace you want to transfer the project to. 1. Confirm the transfer by typing the project's path as instructed. @@ -197,7 +221,7 @@ This action either: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/32935) in GitLab 12.6. -To restore a project that is marked for deletion: +To restore a project marked for deletion: 1. Navigate to your project, and select **{settings}** **Settings > General > Advanced**. 1. In the Restore project section, click the **Restore project** button. @@ -205,8 +229,8 @@ To restore a project that is marked for deletion: #### Removing a fork relationship Forking is a great way to [contribute to a project](../repository/forking_workflow.md) -of which you are not a member. -If you want to use the fork for yourself and do not need to send +of which you're not a member. +If you want to use the fork for yourself and don't need to send [merge requests](../merge_requests.md) to the upstream project, you can safely remove the fork relationship. diff --git a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml index 426f0238f9d..c3ca44eea9e 100644 --- a/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Browser-Performance-Testing.gitlab-ci.yml @@ -1,11 +1,13 @@ performance: stage: performance - image: docker:stable + # pin to a version matching the dind service, just to be safe + image: docker:19.03.5 allow_failure: true variables: DOCKER_TLS_CERTDIR: "" services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind script: - | if ! docker info &>/dev/null; then diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml index 8061da968ed..488945ffa3e 100644 --- a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml @@ -4,7 +4,8 @@ build: variables: DOCKER_TLS_CERTDIR: "" services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind script: - | if [[ -z "$CI_COMMIT_TAG" ]]; then diff --git a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml index 8bc60a36ebd..dd5144e28a7 100644 --- a/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml @@ -1,9 +1,11 @@ code_quality: stage: test - image: docker:stable + # pin to a version matching the dind service, just to be safe + image: docker:19.03.5 allow_failure: true services: - - docker:stable-dind + # pin to a known working version until https://gitlab.com/gitlab-org/gitlab-runner/issues/6697 is fixed + - docker:19.03.5-dind variables: DOCKER_DRIVER: overlay2 DOCKER_TLS_CERTDIR: "" diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 1c314976b4e..08e09747ae2 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,63 +1,4 @@ -require_relative 'cop/gitlab/const_get_inherit_false' -require_relative 'cop/gitlab/module_with_instance_variables' -require_relative 'cop/gitlab/predicate_memoization' -require_relative 'cop/gitlab/httparty' -require_relative 'cop/gitlab/finder_with_find_by' -require_relative 'cop/gitlab/union' -require_relative 'cop/gitlab/rails_logger' -require_relative 'cop/gitlab/keys-first-and-values-first' -require_relative 'cop/include_sidekiq_worker' -require_relative 'cop/safe_params' -require_relative 'cop/active_record_association_reload' -require_relative 'cop/avoid_return_from_blocks' -require_relative 'cop/avoid_break_from_strong_memoize' -require_relative 'cop/avoid_route_redirect_leading_slash' -require_relative 'cop/line_break_around_conditional_block' -require_relative 'cop/prefer_class_methods_over_module' -require_relative 'cop/put_project_routes_under_scope' -require_relative 'cop/put_group_routes_under_scope' -require_relative 'cop/migration/add_column' -require_relative 'cop/migration/add_column_with_default' -require_relative 'cop/migration/add_concurrent_foreign_key' -require_relative 'cop/migration/add_concurrent_index' -require_relative 'cop/migration/add_index' -require_relative 'cop/migration/add_limit_to_string_columns' -require_relative 'cop/migration/add_reference' -require_relative 'cop/migration/add_timestamps' -require_relative 'cop/migration/datetime' -require_relative 'cop/migration/hash_index' -require_relative 'cop/migration/remove_column' -require_relative 'cop/migration/remove_concurrent_index' -require_relative 'cop/migration/remove_index' -require_relative 'cop/migration/reversible_add_column_with_default' -require_relative 'cop/migration/safer_boolean_column' -require_relative 'cop/migration/timestamps' -require_relative 'cop/migration/update_column_in_batches' -require_relative 'cop/migration/update_large_table' -require_relative 'cop/project_path_helper' -require_relative 'cop/rspec/any_instance_of' -require_relative 'cop/rspec/be_success_matcher' -require_relative 'cop/rspec/env_assignment' -require_relative 'cop/rspec/factories_in_migration_specs' -require_relative 'cop/rspec/top_level_describe_path' -require_relative 'cop/rspec/have_gitlab_http_status' -require_relative 'cop/qa/element_with_pattern' -require_relative 'cop/qa/ambiguous_page_object_name' -require_relative 'cop/sidekiq_options_queue' -require_relative 'cop/scalability/file_uploads' -require_relative 'cop/scalability/bulk_perform_with_context' -require_relative 'cop/scalability/cron_worker_context' -require_relative 'cop/destroy_all' -require_relative 'cop/ruby_interpolation_in_translation' -require_relative 'code_reuse_helpers' -require_relative 'cop/code_reuse/finder' -require_relative 'cop/code_reuse/service_class' -require_relative 'cop/code_reuse/presenter' -require_relative 'cop/code_reuse/serializer' -require_relative 'cop/code_reuse/active_record' -require_relative 'cop/code_reuse/worker' -require_relative 'cop/group_public_or_visible_to_user' -require_relative 'cop/inject_enterprise_edition_module' -require_relative 'cop/graphql/authorize_types' -require_relative 'cop/graphql/descriptions' -require_relative 'cop/ignored_columns' +# frozen_string_literal: true + +# Auto-require all cops under `rubocop/cop/**/*.rb` +Dir[File.join(__dir__, 'cop', '**', '*.rb')].each(&method(:require)) |