Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
93291c3d
Commit
93291c3d
authored
Mar 17, 2019
by
Maxim Filippov
🌚
Browse files
Order users by nickname
parent
6d6f48d0
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
93291c3d
...
...
@@ -773,7 +773,7 @@ def get_recipients_from_activity(%Activity{recipients: to}) do
})
::
{
:ok
,
[
Pleroma
.
User
.
t
()],
number
()}
def
search_for_admin
(%{
query:
nil
,
local:
local
,
page:
page
,
page_size:
page_size
})
do
query
=
from
(
u
in
User
,
order_by:
u
.
id
)
from
(
u
in
User
,
order_by:
u
.
nickname
)
|>
maybe_local_user_query
(
local
)
paginated_query
=
...
...
test/upload_test.exs
View file @
93291c3d
...
...
@@ -150,8 +150,7 @@ test "escapes invalid characters in url" do
{
:ok
,
data
}
=
Upload
.
store
(
file
)
[
attachment_url
|
_
]
=
data
[
"url"
]
assert
Path
.
basename
(
attachment_url
[
"href"
])
==
"an%E2%80%A6%20image.jpg"
assert
Path
.
basename
(
attachment_url
[
"href"
])
==
"an%E2%80%A6%20image.jpg"
end
test
"escapes reserved uri characters"
do
...
...
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