Commit a9090c96 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents e6143067 c2e46802
......@@ -207,8 +207,7 @@ input[type='checkbox']:hover {
pointer-events: none;
}
.search-text-input,
.project-filter-form-field {
.search-text-input {
padding-left: $gl-padding + 15px;
padding-right: $gl-padding + 15px;
}
......
......@@ -4,7 +4,7 @@
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
.prepend-top-default
.search-holder
= render 'shared/projects/search_form', autofocus: true, icon: true, admin_view: true
= render 'shared/projects/search_form', autofocus: true, admin_view: true
.dropdown
- toggle_text = 'Namespace'
- if params[:namespace_id].present?
......
---
title: Unified presentation of the filter input field for projects listings
merge_request: 32706
author:
type: changed
......@@ -29,15 +29,17 @@ describe('MergeRequest', function() {
mock.restore();
});
it('modifies the Markdown field', function() {
it('modifies the Markdown field', done => {
spyOn($, 'ajax').and.stub();
const changeEvent = document.createEvent('HTMLEvents');
changeEvent.initEvent('change', true, true);
$('input[type=checkbox]')
.attr('checked', true)[0]
.dispatchEvent(changeEvent);
expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
setTimeout(() => {
expect($('.js-task-list-field').val()).toBe('- [x] Task List Item');
done();
});
});
describe('tasklist', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment