diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 06:12:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-08 06:12:12 +0300 |
commit | 2e2957367a311963930ea30bc2087a3018772fba (patch) | |
tree | cdd7f98ae114b35ac9d03de82a7ff46e4ca1ff7e | |
parent | 1a35cd021a02aec1cf98dac843359837e3a1affd (diff) |
Add latest changes from gitlab-org/gitlab@master
-rw-r--r-- | app/mailers/previews/notify_preview.rb | 4 | ||||
-rw-r--r-- | doc/administration/server_hooks.md | 21 | ||||
-rw-r--r-- | doc/development/documentation/styleguide/img/tabs.png | bin | 0 -> 7012 bytes | |||
-rw-r--r-- | doc/development/documentation/styleguide/index.md | 4 | ||||
-rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb | 2 |
5 files changed, 22 insertions, 9 deletions
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index be8d96012cc..7dfb62dc973 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -60,6 +60,10 @@ class NotifyPreview < ActionMailer::Preview end end + def user_cap_reached + Notify.user_cap_reached(user.id).message + end + def new_mention_in_merge_request_email Notify.new_mention_in_merge_request_email(user.id, issue.id, user.id).message end diff --git a/doc/administration/server_hooks.md b/doc/administration/server_hooks.md index 41b19f7477f..751f4f8e01a 100644 --- a/doc/administration/server_hooks.md +++ b/doc/administration/server_hooks.md @@ -65,16 +65,21 @@ To create a Git hook that applies to all repositories, set a global server hook. ### Choose a server hook directory -Before creating a global server hook, you must choose a directory for it. The global server hook directory: +Before creating a global server hook, you must choose a directory for it. -- For Omnibus GitLab installations, set the directory in `gitlab.rb` under `gitaly['custom_hooks_dir']`. You can use the default suggestion `/var/opt/gitlab/gitaly/custom_hooks` directory - by uncommenting `gitaly['custom_hooks_dir']` to enable it. -- For an installation from source is usually `/home/git/gitlab-shell/hooks`. +For Omnibus GitLab installations, the directory is set in `gitlab.rb` under `gitaly['custom_hooks_dir']`. You can either: -- For source installations, the configuration location depends on the GitLab version. For: - - GitLab 13.0 and earlier, set in `gitlab-shell/config.yml`. - - GitLab 13.1 and later, set in `gitaly/config.toml` under the `[hooks]` section. However, GitLab honors the - `custom_hooks_dir` value in `gitlab-shell/config.yml` if the value in `gitaly/config.toml` is blank or non-existent. +- Use the default suggestion of the `/var/opt/gitlab/gitaly/custom_hooks` directory by uncommenting it. +- Add your own setting. + +For installations from source: + +- The directory is set in a configuration file. The location of the configuration file depends on the GitLab version: + - For GitLab 13.1 and later, the directory is set in `gitaly/config.toml` under the `[hooks]` section. However, + GitLab honors the `custom_hooks_dir` value in `gitlab-shell/config.yml` if the value in `gitaly/config.toml` is blank + or non-existent. + - For GitLab 13.0 and earlier, the directory set in `gitlab-shell/config.yml`. +- The default directory is `/home/git/gitlab-shell/hooks`. ### Create the global server hook diff --git a/doc/development/documentation/styleguide/img/tabs.png b/doc/development/documentation/styleguide/img/tabs.png Binary files differnew file mode 100644 index 00000000000..8be95de4b8c --- /dev/null +++ b/doc/development/documentation/styleguide/img/tabs.png diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md index 9773729fc54..81e164b55a9 100644 --- a/doc/development/documentation/styleguide/index.md +++ b/doc/development/documentation/styleguide/index.md @@ -1381,6 +1381,10 @@ Here's some other content in tab two. ::EndTabs ``` +This code renders on the GitLab documentation site as: + +![tab example](img/tabs.png) + For tab titles, be brief and consistent. Ensure they are parallel, and start each with a capital letter. For example: diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb index 0f65647e168..109cf7b73c3 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb @@ -18,7 +18,7 @@ module QA end it 'can merge feature branch fork to mainline', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347818', quarantine: { - only: { subdomain: :production }, + only: :production, type: :investigating, issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/372258' } do |