diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-19 03:09:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-10-19 03:09:33 +0300 |
commit | 18e11db5dc1916003766af8a3e1675d2f4713a7a (patch) | |
tree | dad6fe90119172ac161f5f174b0ead8d3456408c /app/assets | |
parent | cace5e8ff1f766b8098e35adc94abc4402aeb2a9 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets')
5 files changed, 12 insertions, 10 deletions
diff --git a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue index d057d61d9cd..ed11fe1130d 100644 --- a/app/assets/javascripts/clusters/agents/components/activity_history_item.vue +++ b/app/assets/javascripts/clusters/agents/components/activity_history_item.vue @@ -46,7 +46,7 @@ export default { </script> <template> <history-item :icon="eventDetails.eventTypeIcon" class="gl-my-0! gl-px-0! gl-pb-0!"> - <strong class="gl-pl-5 gl-font-lg"> + <strong class="gl-pl-3 gl-font-lg"> <gl-sprintf :message="eventDetails.title" ><template v-if="eventDetails.titleIcon" #titleIcon ><gl-icon @@ -61,7 +61,7 @@ export default { </strong> <template #body> - <p class="gl-mb-0 gl-pb-3 gl-ml-3 gl-text-secondary" :class="bodyClass"> + <p class="gl-mt-2 gl-mb-0 gl-ml-3 gl-pb-3 gl-text-secondary" :class="bodyClass"> <gl-sprintf :message="eventDetails.body"> <template #userName> <span class="gl-font-weight-bold gl-text-body">{{ eventDetails.user.name }}</span> diff --git a/app/assets/javascripts/members/components/table/members_table.vue b/app/assets/javascripts/members/components/table/members_table.vue index 460dc0041ab..0512bc04085 100644 --- a/app/assets/javascripts/members/components/table/members_table.vue +++ b/app/assets/javascripts/members/components/table/members_table.vue @@ -2,7 +2,7 @@ import { GlTable, GlBadge, GlPagination } from '@gitlab/ui'; import { mapState } from 'vuex'; import MembersTableCell from 'ee_else_ce/members/components/table/members_table_cell.vue'; -import { canOverride, canRemove, canResend, canUpdate } from 'ee_else_ce/members/utils'; +import { canUnban, canOverride, canRemove, canResend, canUpdate } from 'ee_else_ce/members/utils'; import { mergeUrlParams } from '~/lib/utils/url_utility'; import UserDate from '~/vue_shared/components/user_date.vue'; import { @@ -90,7 +90,8 @@ export default { canRemove(member) || canResend(member) || canUpdate(member, this.currentUserId) || - canOverride(member) + canOverride(member) || + canUnban(member) ); }, showField(field) { diff --git a/app/assets/javascripts/members/utils.js b/app/assets/javascripts/members/utils.js index 0da44b7d468..bf87ab53d36 100644 --- a/app/assets/javascripts/members/utils.js +++ b/app/assets/javascripts/members/utils.js @@ -105,9 +105,12 @@ export const buildSortHref = ({ return setUrlParams({ ...filterParams, sort: sortParam }, window.location.href, true); }; -// Defined in `ee/app/assets/javascripts/vue_shared/components/members/utils.js` +// Defined in `ee/app/assets/javascripts/members/utils.js` export const canOverride = () => false; +// Defined in `ee/app/assets/javascripts/members/utils.js` +export const canUnban = () => false; + export const parseDataAttributes = (el) => { const { membersData } = el.dataset; diff --git a/app/assets/javascripts/pipeline_wizard/components/widgets/list.vue b/app/assets/javascripts/pipeline_wizard/components/widgets/list.vue index a5ce56daf07..bc62d6d4465 100644 --- a/app/assets/javascripts/pipeline_wizard/components/widgets/list.vue +++ b/app/assets/javascripts/pipeline_wizard/components/widgets/list.vue @@ -176,7 +176,7 @@ export default { category="secondary" data-testid="remove-step-button" icon="remove" - @click="removeValue" + @click="() => removeValue(i)" /> </template> </gl-form-input-group> diff --git a/app/assets/stylesheets/page_bundles/cluster_agents.scss b/app/assets/stylesheets/page_bundles/cluster_agents.scss index 61d752afd7a..d1fab55738f 100644 --- a/app/assets/stylesheets/page_bundles/cluster_agents.scss +++ b/app/assets/stylesheets/page_bundles/cluster_agents.scss @@ -7,9 +7,7 @@ } } - &.issuable-discussion .main-notes-list::before { - @include gl-top-3; - @include gl-left-5; - height: calc(100% - 30px); + .timeline-entry::before { + @include gl-mt-4; } } |