Skip to content

Commit

Permalink
Merge pull request #111 from WPMedia/release_candidate/1.0.2/0
Browse files Browse the repository at this point in the history
Release candidate/1.0.2/0
  • Loading branch information
Kat-Alo authored Oct 10, 2023
2 parents 258fc98 + fd0ceb3 commit 053b5c3
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 14 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ jobs:
ports:
- 5432:5432

steps:
- name: Checkout the project
uses: actions/checkout@v3
# steps:
# - name: Checkout the project
# uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true
# - name: Set up Ruby
# uses: ruby/setup-ruby@v1
# with:
# bundler-cache: true

- name: Compile assets
run: bundle exec rake assets:precompile assets:clean
# - name: Compile assets
# run: bundle exec rake assets:precompile assets:clean

- name: Prepare the database
run: bundle exec rake db:create db:schema:load --trace
# - name: Prepare the database
# run: bundle exec rake db:create db:schema:load --trace

- name: Run the tests
run: bundle exec rspec --tag ~skip --tag ~pending --format RSpec::Github::Formatter
# - name: Run the tests
# run: bundle exec rspec --tag ~skip --tag ~pending --format RSpec::Github::Formatter
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ gem 'rails-healthcheck'

gem 'ddtrace', require: 'ddtrace/auto_instrument'

gem 'miss_hannigan'

group :development, :test do
gem 'byebug'
gem 'rspec-rails'
Expand Down
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ GEM
mini_racer (0.6.3)
libv8-node (~> 16.10.0.0)
minitest (5.17.0)
miss_hannigan (0.1.2)
rails (>= 5.1)
msgpack (1.6.0)
multi_xml (0.6.0)
mustermann (3.0.0)
Expand Down Expand Up @@ -380,6 +382,7 @@ DEPENDENCIES
kramdown
letter_opener
mini_racer (~> 0.6.3)
miss_hannigan
pg (~> 1.4)
premailer-rails
puma (~> 5.6)
Expand Down
2 changes: 1 addition & 1 deletion app/models/page.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class Page < ApplicationRecord
belongs_to :user

has_many :page_snapshots, dependent: :destroy
has_many :page_snapshots, dependent: :nullify_then_purge

attr_accessor :subscriptions # Gets set in controller on update/create
after_create :update_subscriptions
Expand Down

0 comments on commit 053b5c3

Please sign in to comment.