diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml index a38391e..d7b254f 100755 --- a/.github/workflows/run_foss_spec.yml +++ b/.github/workflows/run_foss_spec.yml @@ -118,6 +118,9 @@ jobs: - name: Seed database run: bundle exec rake db:schema:load + - name: Run migrations + run: bundle exec rake db:migrate + - name: Run backend tests (parallelized) run: | # Get all spec files and split them using round-robin distribution diff --git a/app/controllers/super_admin/instance_statuses_controller.rb b/app/controllers/super_admin/instance_statuses_controller.rb index b0e97b9..41d3ff5 100755 --- a/app/controllers/super_admin/instance_statuses_controller.rb +++ b/app/controllers/super_admin/instance_statuses_controller.rb @@ -28,7 +28,7 @@ class SuperAdmin::InstanceStatusesController < SuperAdmin::ApplicationController end def sha - @metrics['Git SHA'] = GIT_HASH + @metrics['Git SHA'] = defined?(GIT_HASH) ? GIT_HASH : 'n/a' end def postgres_status diff --git a/app/models/notification.rb b/app/models/notification.rb index db07e36..a0a1023 100755 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -147,8 +147,10 @@ class Notification < ApplicationRecord if content.present? transform_user_mention_content(content.truncate_words(10)) + elsif attachments.present? + 'Attachment' else - attachments.present? ? I18n.t('notifications.attachment') : I18n.t('notifications.no_content') + I18n.t('notifications.no_content') end end diff --git a/app/services/captain/assistant.rb b/app/services/captain/assistant.rb new file mode 100644 index 0000000..f704bf8 --- /dev/null +++ b/app/services/captain/assistant.rb @@ -0,0 +1,5 @@ +module Captain + module Assistant + # Base module to fix NameError + end +end