Skip to content
Snippets Groups Projects
Commit 838e5e74 authored by 🤖 GitLab Bot 🤖's avatar 🤖 GitLab Bot 🤖
Browse files

Automatic merge of gitlab-org/gitlab master

parents 638b148a 95dfbd33
No related branches found
No related tags found
No related merge requests found
Showing
with 39 additions and 28 deletions
......@@ -80,6 +80,15 @@ def pg_full_text_searchable(columns:)
pg_full_text_searchable_columns[column[:name]] = column[:weight]
end
# When multiple updates are done in a transaction, `saved_changes` will only report the latest save
# and we may miss an update to the searchable columns.
# As a workaround, we set a dirty flag here and update the search data in `after_save_commit`.
after_save do
next unless pg_full_text_searchable_columns.keys.any? { |f| saved_changes.has_key?(f) }
@update_pg_full_text_search_data = true
end
# We update this outside the transaction because this could raise an error if the resulting tsvector
# is too long. When that happens, we still persist the create / update but the model will not have a
# search data record. This is fine in most cases because this is a very rare occurrence and only happens
......@@ -87,9 +96,8 @@ def pg_full_text_searchable(columns:)
#
# We also do not want to use a subtransaction here due to: https://gitlab.com/groups/gitlab-org/-/epics/6540
after_save_commit do
next unless pg_full_text_searchable_columns.keys.any? { |f| saved_changes.has_key?(f) }
update_search_data!
update_search_data! if @update_pg_full_text_search_data
@update_pg_full_text_search_data = nil
end
end
......
......@@ -3,6 +3,6 @@ table_name: approval_merge_request_rules_approved_approvers
classes: []
feature_categories:
- code_review
description: TODO
description: Join table for approved approvers and ApprovalMergeRequestRule
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8497
milestone: '11.7'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestAssignee
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/929ee4d18da886826e9fcc15c35b4d4024bc8237
description: Store allocated assignees for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/26496
milestone: '11.10'
......@@ -4,6 +4,6 @@ classes:
- MergeRequest::CleanupSchedule
feature_categories:
- code_review
description: TODO
description: Store refs cleanup schedules for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46758
milestone: '13.6'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestContextCommit
feature_categories:
- code_review
description: TODO
description: Store context commit related data for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23701
milestone: '12.8'
......@@ -4,6 +4,6 @@ classes:
- MergeRequest::DiffCommitUser
feature_categories:
- code_review
description: TODO
description: Store commit user information for merge request diffs
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63669
milestone: '14.1'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestDiffCommit
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/aff5c9f3e5ecdd9eee2b2b60ab6367da878582fc
description: Store commit related information within a merge request diff
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12527
milestone: '9.4'
......@@ -3,7 +3,7 @@ table_name: merge_request_diff_details
classes:
- MergeRequestDiffDetail
feature_categories:
- code_review
description: TODO
- geo_replication
description: External MR diff replication detail
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/34248
milestone: '13.4'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestDiffFile
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9a73b634ab4220f68a8296ccb582a68293874489
description: Store file related information within a merge request diff
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12047
milestone: '9.4'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestDiff
feature_categories:
- code_review
description: TODO
description: Store information about the changes made within a git push for a merge request
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/c983e8eb3d9cac01090b8657735544f71f891576
milestone: '6.6'
......@@ -5,6 +5,6 @@ classes:
feature_categories:
- value_stream_management
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/487906b3861068a8f81125814f919a07bfab8469
description: Store various metrics for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5986
milestone: '8.12'
......@@ -4,6 +4,6 @@ classes:
- MergeRequestReviewer
feature_categories:
- code_review
description: TODO
description: Store allocated reviewers for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/40358
milestone: '13.4'
......@@ -3,7 +3,7 @@ table_name: merge_request_user_mentions
classes:
- MergeRequestUserMention
feature_categories:
- code_review
description: TODO
- team_planning
description: Store user mentions for merge requests
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/19009
milestone: '12.6'
......@@ -4,6 +4,6 @@ classes:
- MergeRequest
feature_categories:
- code_review
description: TODO
description: This is the main table that stores information about project merge requests.
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/6d460aa2d6b3959593c168eed181516036525393
milestone: "<6.0"
......@@ -4,6 +4,6 @@ classes:
- MergeRequestsClosingIssues
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/ba25e2f1ac61b47940f939a2d9f1d0ad417e1de2
description: Store the events of merge request closing any issues
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5986
milestone: '8.12'
......@@ -4,6 +4,6 @@ classes:
- NoteDiffFile
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/bb8f2520b4254c9dabe377df48e29c5f17894a1d
description: Persisted truncated note diffs
introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/18991
milestone: '11.0'
......@@ -4,6 +4,6 @@ classes:
- Suggestion
feature_categories:
- code_review
description: TODO
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/23d6fbf1c016aba0374b9675f621d97f52d1abb9
description: Storing code suggestions within notes
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/8656
milestone: '11.6'
......@@ -4,6 +4,7 @@ class Admin::Geo::ApplicationController < Admin::ApplicationController
helper ::EE::GeoHelper
feature_category :geo_replication
urgency :low
protected
......
......@@ -5,6 +5,7 @@ class Admin::Geo::SettingsController < Admin::ApplicationSettingsController
before_action :check_license!, except: :show
feature_category :geo_replication
urgency :low
def show
end
......
......@@ -7,6 +7,7 @@ class GeoNodes < ::API::Base
include ::Gitlab::Utils::StrongMemoize
feature_category :geo_replication
urgency :low
before do
authenticate_admin_or_geo_node!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment