Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN apt-get update -qq && \
libyaml-dev

# Add Node, required for asset pipeline.
RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - && \
apt-get install -y nodejs && \
npm install -q -g yarn

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ group :development, :test do
gem 'brakeman', '~> 7.0.2', require: false
gem 'bullet', '~> 8.0', '>= 8.0.8'
gem 'colorize', '~> 1.1.0'
gem 'consistency_fail'
gem 'database_consistency', '~> 2.0.6'
gem 'dotenv-rails', '~> 3.1.8'
gem 'guard-livereload', '~> 2.5.2'
gem 'guard-rspec', '~> 4.7.3', require: false
Expand Down
10 changes: 4 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ GEM
colorize (1.1.0)
concurrent-ruby (1.3.5)
connection_pool (2.5.4)
consistency_fail (0.3.7)
crass (1.0.6)
database_consistency (2.0.6)
activerecord (>= 3.2)
date (3.4.1)
devise (4.9.4)
bcrypt (~> 3.0)
Expand Down Expand Up @@ -250,6 +251,7 @@ GEM
mina (1.2.5)
rake
mini_mime (1.1.5)
minitest (5.25.5)
mini_portile2 (2.8.9)
minitest (5.26.0)
mollie-api-ruby (4.17.0)
Expand Down Expand Up @@ -277,9 +279,6 @@ GEM
net-ssh (7.3.0)
netrc (0.11.0)
nio4r (2.7.4)
nokogiri (1.18.8)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.18.8-x86_64-linux-gnu)
racc (~> 1.4)
notiffany (0.1.3)
Expand Down Expand Up @@ -597,7 +596,6 @@ GEM
zeitwerk (2.7.3)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
Expand All @@ -610,7 +608,7 @@ DEPENDENCIES
bullet (~> 8.0, >= 8.0.8)
capistrano-sidekiq (~> 3.0.0)
colorize (~> 1.1.0)
consistency_fail
database_consistency (~> 2.0.6)
devise (~> 4.9.4)
devise-i18n (~> 1.13.0)
dotenv-rails (~> 3.1.8)
Expand Down
4 changes: 1 addition & 3 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
environment: '<%= Rails.env %>',
release: '<%= ENV['BUILD_HASH'] %>'
});
Sentry.configureScope(scope => {
scope.setUser({ id: <%= current_user&.id || 'null' %> });
});
Sentry.setUser({ id: <%= current_user&.id.to_json %> });
</script>
<% end %>

Expand Down
4 changes: 2 additions & 2 deletions bin/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ if [ "${TYPE}" = "lint" ] || [ "${TYPE}" = "" ]; then
gem install bundler-audit
bundle-audit update && bundle-audit check --ignore CVE-2015-9284 || true
RAILS_ENV=test bundle exec rails db:create db:environment:set db:schema:load
# Don't check DB consistency until solved: https://github.com/trptcolin/consistency_fail/issues/42
# bundle exec consistency_fail
# uncomment when it does not fail anymore :)
# bundle exec database_consistency

echo "--- :eslint: Yarn lint"
yarn install # Why do I need to do this again? This was done in Dockerfile, rite?
Expand Down
5 changes: 5 additions & 0 deletions db/migrate/20251026202155_remove_order_total_from_orders.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class RemoveOrderTotalFromOrders < ActiveRecord::Migration[7.2]
def change
remove_column :orders, :order_total, :decimal
end
end
3 changes: 1 addition & 2 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.2].define(version: 2025_09_13_233761) do
ActiveRecord::Schema[7.2].define(version: 2025_10_26_202155) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

Expand Down Expand Up @@ -81,7 +81,6 @@
end

create_table "orders", force: :cascade do |t|
t.decimal "order_total", precision: 8, scale: 2
t.bigint "activity_id", null: false
t.bigint "user_id"
t.datetime "deleted_at"
Expand Down