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
0
Merge Requests
0
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
iv
gitlab-ce
Commits
e58e75aa
Commit
e58e75aa
authored
Aug 13, 2015
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: User search feature in admin area does not respect filters
parent
00a33d67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CHANGELOG
CHANGELOG
+1
-0
app/views/admin/users/index.html.haml
app/views/admin/users/index.html.haml
+1
-0
No files found.
CHANGELOG
View file @
e58e75aa
...
@@ -55,6 +55,7 @@ v 7.14.0 (unreleased)
...
@@ -55,6 +55,7 @@ v 7.14.0 (unreleased)
- Add dropzone upload progress
- Add dropzone upload progress
- Add a label for merged branches on branches page (Florent Baldino)
- Add a label for merged branches on branches page (Florent Baldino)
- Detect .mkd and .mkdn files as markdown (Ben Boeckel)
- Detect .mkd and .mkdn files as markdown (Ben Boeckel)
- Fix: User search feature in admin area does not respect filters
v 7.13.5
v 7.13.5
- Satellites reverted
- Satellites reverted
...
...
app/views/admin/users/index.html.haml
View file @
e58e75aa
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
=
form_tag
admin_users_path
,
method: :get
,
class:
'form-inline'
do
.form-group
.form-group
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'form-control'
=
search_field_tag
:name
,
params
[
:name
],
placeholder:
'Name, email or username'
,
class:
'form-control'
=
hidden_field_tag
"filter"
,
params
[
:filter
]
=
button_tag
class:
'btn btn-primary'
do
=
button_tag
class:
'btn btn-primary'
do
%i
.fa.fa-search
%i
.fa.fa-search
%hr
%hr
...
...
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