Skip to content
Snippets Groups Projects
Commit d11fbccc authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files

Address frontend feedback

parent 1558bd12
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,8 +10,9 @@
},
};
</script>
<template>
<section class="mr-info-list mr-maintainer-edit">
<section class="mr-info-list mr-links">
<p v-if="maintainerEditAllowed">
{{ s__("mrWidget|Allows edits from maintainers") }}
</p>
Loading
Loading
Loading
Loading
@@ -453,8 +453,7 @@
}
}
 
.mr-links,
.mr-maintainer-edit {
.mr-links {
padding-left: $status-icon-size + $status-icon-margin;
}
 
Loading
Loading
doc/user/project/merge_requests/img/allow_maintainer_push.png

491 KiB | W: 2148px | H: 1756px

doc/user/project/merge_requests/img/allow_maintainer_push.png

96.8 KiB | W: 2148px | H: 1756px

doc/user/project/merge_requests/img/allow_maintainer_push.png
doc/user/project/merge_requests/img/allow_maintainer_push.png
doc/user/project/merge_requests/img/allow_maintainer_push.png
doc/user/project/merge_requests/img/allow_maintainer_push.png
  • 2-up
  • Swipe
  • Onion skin
# Allow maintainer pushes for merge requests accross forks
# Allow maintainer pushes for merge requests across forks
 
This feature is available for merge requests across forked projects that are
publicly accessible. It makes it easier for maintainers of projects to collaborate
Loading
Loading
Loading
Loading
@@ -2,22 +2,39 @@ import Vue from 'vue';
import maintainerEditComponent from '~/vue_merge_request_widget/components/mr_widget_maintainer_edit.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
describe('MRWidgetAuthor', () => {
describe('RWidgetMaintainerEdit', () => {
let Component;
let vm;
 
beforeEach(() => {
const Component = Vue.extend(maintainerEditComponent);
vm = mountComponent(Component, {
maintainerEditAllowed: true,
});
Component = Vue.extend(maintainerEditComponent);
});
 
afterEach(() => {
vm.$destroy();
});
 
it('renders the message when maintainers are allowed to edit', () => {
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
describe('when a maintainer is allowed to edit', () => {
beforeEach(() => {
vm = mountComponent(Component, {
maintainerEditAllowed: true,
});
});
it('it renders the message', () => {
expect(vm.$el.textContent.trim()).toEqual('Allows edits from maintainers');
});
});
describe('when a maintainer is not allowed to edit', () => {
beforeEach(() => {
vm = mountComponent(Component, {
maintainerEditAllowed: false,
});
});
it('hides the message', () => {
expect(vm.$el.textContent.trim()).toEqual('');
});
});
});
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