Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mastofe
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Haelwenn
mastofe
Commits
eee8afb0
Commit
eee8afb0
authored
Feb 05, 2017
by
Eugen Rochko
Browse files
Options
Browse Files
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
with
2 additions
and
2 deletions
+2
-2
app/assets/javascripts/components/components/account.jsx
app/assets/javascripts/components/components/account.jsx
+1
-1
app/controllers/api/v1/blocks_controller.rb
app/controllers/api/v1/blocks_controller.rb
+1
-1
No files found.
app/assets/javascripts/components/components/account.jsx
View file @
eee8afb0
...
...
@@ -51,7 +51,7 @@ const Account = React.createClass({
getDefaultProps
()
{
return
{
withNote
:
tru
e
withNote
:
fals
e
};
},
...
...
app/controllers/api/v1/blocks_controller.rb
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
)
...
...
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