diff options
Diffstat (limited to 'app/assets')
7 files changed, 41 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js index 698302c5209..bda2b05fb8f 100644 --- a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js +++ b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js @@ -1,8 +1,10 @@ import { __ } from '~/locale'; import { TOKEN_TITLE_APPROVED_BY, + TOKEN_TITLE_MERGE_USER, TOKEN_TITLE_REVIEWER, TOKEN_TYPE_APPROVED_BY, + TOKEN_TYPE_MERGE_USER, TOKEN_TYPE_REVIEWER, TOKEN_TYPE_TARGET_BRANCH, TOKEN_TYPE_SOURCE_BRANCH, @@ -174,6 +176,21 @@ export default ( ); IssuableTokenKeys.conditions.push(...approvedBy.condition); + const mergeUserToken = { + formattedKey: TOKEN_TITLE_MERGE_USER, + key: TOKEN_TYPE_MERGE_USER, + type: 'string', + param: 'username', + symbol: '@', + icon: 'merge', + tag: '@merge_user', + hideNotEqual: true, + }; + if (gon.features.mrMergeUserFilter) { + IssuableTokenKeys.tokenKeys.splice(3, 0, mergeUserToken); + IssuableTokenKeys.tokenKeysWithAlternative.splice(3, 0, mergeUserToken); + } + if (!disableEnvironmentFilter) { const environmentToken = { formattedKey: __('Environment'), diff --git a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js index a1782c549d6..e1a5b269fa7 100644 --- a/app/assets/javascripts/filtered_search/available_dropdown_mappings.js +++ b/app/assets/javascripts/filtered_search/available_dropdown_mappings.js @@ -2,6 +2,7 @@ import { sortMilestonesByDueDate } from '~/milestones/utils'; import { mergeUrlParams } from '~/lib/utils/url_utility'; import { TOKEN_TYPE_APPROVED_BY, + TOKEN_TYPE_MERGE_USER, TOKEN_TYPE_ASSIGNEE, TOKEN_TYPE_AUTHOR, TOKEN_TYPE_CONFIDENTIAL, @@ -86,6 +87,11 @@ export default class AvailableDropdownMappings { gl: DropdownUser, element: this.container.querySelector('#js-dropdown-reviewer'), }, + [TOKEN_TYPE_MERGE_USER]: { + reference: null, + gl: DropdownUser, + element: this.container.querySelector('#js-dropdown-merge-user'), + }, attention: { reference: null, gl: DropdownUser, diff --git a/app/assets/javascripts/filtered_search/constants.js b/app/assets/javascripts/filtered_search/constants.js index b328ae6a872..39fa936895c 100644 --- a/app/assets/javascripts/filtered_search/constants.js +++ b/app/assets/javascripts/filtered_search/constants.js @@ -1,5 +1,6 @@ import { TOKEN_TYPE_APPROVED_BY, + TOKEN_TYPE_MERGE_USER, TOKEN_TYPE_ASSIGNEE, TOKEN_TYPE_AUTHOR, TOKEN_TYPE_REVIEWER, @@ -9,6 +10,7 @@ export const USER_TOKEN_TYPES = [ TOKEN_TYPE_AUTHOR, TOKEN_TYPE_ASSIGNEE, TOKEN_TYPE_APPROVED_BY, + TOKEN_TYPE_MERGE_USER, TOKEN_TYPE_REVIEWER, 'attention', ]; diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js index 6549de96c98..2879dcbdf0b 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js @@ -62,6 +62,7 @@ export const TOKEN_EMPTY_SEARCH_TERM = { }; export const TOKEN_TITLE_APPROVED_BY = __('Approved-By'); +export const TOKEN_TITLE_MERGE_USER = __('Merged-By'); export const TOKEN_TITLE_ASSIGNEE = s__('SearchToken|Assignee'); export const TOKEN_TITLE_AUTHOR = __('Author'); export const TOKEN_TITLE_CONFIDENTIAL = __('Confidential'); @@ -86,6 +87,7 @@ export const TOKEN_TITLE_CREATED = __('Created date'); export const TOKEN_TITLE_CLOSED = __('Closed date'); export const TOKEN_TYPE_APPROVED_BY = 'approved-by'; +export const TOKEN_TYPE_MERGE_USER = 'merge-user'; export const TOKEN_TYPE_ASSIGNEE = 'assignee'; export const TOKEN_TYPE_AUTHOR = 'author'; export const TOKEN_TYPE_CONFIDENTIAL = 'confidential'; diff --git a/app/assets/stylesheets/framework/super_sidebar.scss b/app/assets/stylesheets/framework/super_sidebar.scss index 5a9a739fb13..23cd8cf259a 100644 --- a/app/assets/stylesheets/framework/super_sidebar.scss +++ b/app/assets/stylesheets/framework/super_sidebar.scss @@ -271,6 +271,14 @@ $super-sidebar-transition-hint-duration: $super-sidebar-transition-duration / 4; } } + /** + * Add transition to align with GlButton :hover/:focus transition + */ + .brand-logo, + .user-bar-button { + @include transition(background-color, border-color, color, box-shadow); + } + .btn-default-tertiary { mix-blend-mode: normal; } diff --git a/app/assets/stylesheets/page_bundles/settings.scss b/app/assets/stylesheets/page_bundles/settings.scss index b906a932e70..f8a5f28170a 100644 --- a/app/assets/stylesheets/page_bundles/settings.scss +++ b/app/assets/stylesheets/page_bundles/settings.scss @@ -140,7 +140,6 @@ border-radius: $gl-border-radius-base; } - .prometheus-metrics-monitoring { .gl-card { .badge.badge-pill { diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss index 7ae17f4c191..781ab5629d7 100644 --- a/app/assets/stylesheets/utilities.scss +++ b/app/assets/stylesheets/utilities.scss @@ -146,3 +146,9 @@ .gl-pl-12 { padding-left: $gl-spacing-scale-12; } + +.gl-sm-mr-auto { + @media (min-width: $breakpoint-md) { + margin-right: auto; + } +} |