diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 09:10:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-03 09:10:50 +0300 |
| commit | 18876223fd5dc347c26a65838b4e93fbd2702b9f (patch) | |
| tree | 6bbcf01df96fd5ba0c1dc1d79a9ec50989ba2688 | |
| parent | c1efda3e21330804ea49a7ff4c87a7d35131ee7b (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | app/views/groups/merge_requests.html.haml | 2 | ||||
| -rw-r--r-- | doc/.vale/gitlab/spelling-exceptions.txt | 1 | ||||
| -rw-r--r-- | doc/administration/package_information/defaults.md | 2 | ||||
| -rw-r--r-- | spec/controllers/groups_controller_spec.rb | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index 8d858ad72d2..19a7419f539 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -1,4 +1,4 @@ -- @can_bulk_update = can?(current_user, :admin_merge_request, @group) && @group.licensed_feature_available?(:group_bulk_edit) && issuables_count_for_state(:merge_requests, :all) > 0 +- @can_bulk_update = !!@search_timeout_occurred && can?(current_user, :admin_merge_request, @group) && @group.licensed_feature_available?(:group_bulk_edit) && issuables_count_for_state(:merge_requests, :all) > 0 - page_title _("Merge requests") - add_page_specific_style 'page_bundles/issuable_list' diff --git a/doc/.vale/gitlab/spelling-exceptions.txt b/doc/.vale/gitlab/spelling-exceptions.txt index 910a5a33df6..7d36887de39 100644 --- a/doc/.vale/gitlab/spelling-exceptions.txt +++ b/doc/.vale/gitlab/spelling-exceptions.txt @@ -1186,3 +1186,4 @@ ZenTao zsh Zstandard Zuora +Zoekt diff --git a/doc/administration/package_information/defaults.md b/doc/administration/package_information/defaults.md index 6d89b2a9a5b..3b52b6bca82 100644 --- a/doc/administration/package_information/defaults.md +++ b/doc/administration/package_information/defaults.md @@ -49,7 +49,7 @@ by default: | PgBouncer | No | Port | X | 6432 | | Consul | No | Port | X | 8300, 8301(UDP), 8500, 8600[^Consul-notes] | | Patroni | No | Port | X | 8008 | -| GitLab KAS | No | Port | X | 8150 | +| GitLab KAS | Yes | Port | X | 8150 | | Gitaly | No | Port | X | 8075 | Legend: diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 685f92e6bad..91a4336b800 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -596,6 +596,7 @@ RSpec.describe GroupsController, factory_default: :keep, feature_category: :code expect(response.body).to have_content('Open Merged Closed All') expect(response.body).not_to have_content('Open 0 Merged 0 Closed 0 All 0') + expect(assigns(:can_bulk_update)).to be_falsey end end end |