Skip to content

Commit

Permalink
Merge pull request #220 from transientBug/bugfixes
Browse files Browse the repository at this point in the history
Small visual bugfixes
  • Loading branch information
JoshAshby authored Feb 24, 2024
2 parents 2155660 + f6d6b16 commit d2661df
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 4 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ docker/
!docker/entrypoint.sh

README.md
vendor/bundle
36 changes: 36 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Deploy

on:
pull_request:
branches:
- '*'
push:
branches:
- master
Expand All @@ -9,10 +12,43 @@ jobs:
FlyioDeploy:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:14.2
ports:
- 5432/tcp
env:
POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: "testing"
POSTGRES_DATABASE: "transientbug_test"

redis:
image: redis:6.2.6
ports:
- 6379/tcp

steps:
- uses: actions/checkout@v4
- uses: superfly/flyctl-actions/setup-flyctl@master

- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
cache-version: 1

- name: Setup Database
env:
DATABASE_URL: postgresql://postgres:testing@localhost:${{ job.services.postgres.ports['5432'] }}/transientbug_test
REDIS_URL: redis://localhost:${{ job.services.redis.ports['6379'] }}/0
run: ./bin/rails db:prepare

- name: Build API docs
env:
DATABASE_URL: postgresql://postgres:testing@localhost:${{ job.services.postgres.ports['5432'] }}/transientbug_test
REDIS_URL: redis://localhost:${{ job.services.redis.ports['6379'] }}/0
RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
run: ./bin/rails docs:generate

- name: Deploy to fly.io
env:
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion app/views/oauth/applications/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
No applications made yet

= c.footer do
- pagination = paginate @applications, theme: "card_footer"
- pagination = paginate @applications
- if pagination.present?
= pagination
- else
Expand Down
2 changes: 1 addition & 1 deletion app/views/oauth/authorized_applications/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
No applications authorized

= c.footer do
- pagination = paginate @applications, theme: "card_footer"
- pagination = paginate @applications
- if pagination.present?
= pagination
- else
Expand Down
4 changes: 2 additions & 2 deletions app/views/profiles/_form_contact_info.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@
%p.mt-2.text-sm.text-gray-500
We only use this to identify you during login, contact you with important site updates, and to help you recover a lost password. Your email does have to be unique.

= c.footer do
= f.submit "Update", class: "btn -secondary"
= c.footer do
= f.submit "Update", class: "btn -secondary"

0 comments on commit d2661df

Please sign in to comment.