Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a9090c96
Commit
a9090c96
authored
Sep 12, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
e6143067
c2e46802
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
app/assets/stylesheets/pages/search.scss
app/assets/stylesheets/pages/search.scss
+1
-2
app/views/admin/projects/index.html.haml
app/views/admin/projects/index.html.haml
+1
-1
changelogs/unreleased/mishunov-master-patch-90654.yml
changelogs/unreleased/mishunov-master-patch-90654.yml
+5
-0
spec/javascripts/merge_request_spec.js
spec/javascripts/merge_request_spec.js
+5
-3
No files found.
app/assets/stylesheets/pages/search.scss
View file @
a9090c96
...
...
@@ -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
;
}
...
...
app/views/admin/projects/index.html.haml
View file @
a9090c96
...
...
@@ -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?
...
...
changelogs/unreleased/mishunov-master-patch-90654.yml
0 → 100644
View file @
a9090c96
---
title
:
Unified presentation of the filter input field for projects listings
merge_request
:
32706
author
:
type
:
changed
spec/javascripts/merge_request_spec.js
View file @
a9090c96
...
...
@@ -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
'
,
()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment