Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
eee8afb0
Commit
eee8afb0
authored
8 years ago
by
Eugen Rochko
Browse files
Options
Download
Email Patches
Plain Diff
Remove bios from blocked users list, filter out broken entries from API response
parent
c5a08eb5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/assets/javascripts/components/components/account.jsx
+1
-1
app/assets/javascripts/components/components/account.jsx
app/controllers/api/v1/blocks_controller.rb
+1
-1
app/controllers/api/v1/blocks_controller.rb
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/components/components/account.jsx
+
1
-
1
View file @
eee8afb0
...
...
@@ -51,7 +51,7 @@ const Account = React.createClass({
getDefaultProps
()
{
return
{
withNote
:
tru
e
withNote
:
fals
e
};
},
...
...
This diff is collapsed.
Click to expand it.
app/controllers/api/v1/blocks_controller.rb
+
1
-
1
View file @
eee8afb0
...
...
@@ -9,7 +9,7 @@ class Api::V1::BlocksController < ApiController
def
index
results
=
Block
.
where
(
account:
current_account
).
paginate_by_max_id
(
limit_param
(
DEFAULT_ACCOUNTS_LIMIT
),
params
[
:max_id
],
params
[
:since_id
])
accounts
=
Account
.
where
(
id:
results
.
map
(
&
:target_account_id
)).
map
{
|
a
|
[
a
.
id
,
a
]
}.
to_h
@accounts
=
results
.
map
{
|
f
|
accounts
[
f
.
target_account_id
]
}
@accounts
=
results
.
map
{
|
f
|
accounts
[
f
.
target_account_id
]
}
.
compact
set_account_counters_maps
(
@accounts
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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
Menu
Explore
Projects
Groups
Snippets