Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
Kagemaru committed Sep 30, 2024
1 parent ea1ee07 commit c33020c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Puma is unhappy without this
!/tmp/pids
/tmp/pids/*
!/tmp/pids/.keep
!/tmp/pids/.keep

# Ignore uploaded files in development
/storage/*
Expand Down Expand Up @@ -56,4 +56,4 @@ vendor/bundle
yarn-debug.log*
.yarn-integrity

/.idea
/.idea
10 changes: 5 additions & 5 deletions app/cells/decidim/content_blocks/last_blog_posts_cell.rb
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ def activities

@activities ||=
Decidim::ActionLog
.where(visibility: %w(public-only all))
.where(organization: current_organization)
.where(resource_type: "Decidim::Blogs::Post")
.where(action: "create")
.order(created_at: :desc)
.where(visibility: %w(public-only all))
.where(organization: current_organization)
.where(resource_type: "Decidim::Blogs::Post")
.where(action: "create")
.order(created_at: :desc)
end

def activities_to_show
Expand Down
6 changes: 4 additions & 2 deletions docker-compose-build.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
version: '3.3'
services:
app: &app
Expand Down Expand Up @@ -42,7 +43,7 @@ services:
- pg-data:/var/lib/postgresql/data
cache:
image: memcached:1.5-alpine
command: [ memcached, -l, '0.0.0.0', -p, '11211' ]
command: [memcached, -l, '0.0.0.0', -p, '11211']

adminer:
image: adminer
Expand All @@ -62,10 +63,11 @@ services:
depends_on: []
ports: []
entrypoint: []
command: [ rake, 'jobs:work' ]
command: [rake, 'jobs:work']

volumes:
node_modules: {}
bundle: {}
pg-data: {}
db-init: {}
...
2 changes: 1 addition & 1 deletion test/controllers/status_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def test_health

def test_readiness
endpoint_test :readiness
end
end

private

Expand Down

0 comments on commit c33020c

Please sign in to comment.