Skip to content

Commit 41270a7

Browse files
Merge branch 'main' into 5446-duplicate_item_entries_multiple_barcodes
2 parents ac46edd + d1c27f3 commit 41270a7

File tree

102 files changed

+2371
-387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2371
-387
lines changed

.devcontainer/docker-compose.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ services:
2828
POSTGRES_USER: postgres
2929
POSTGRES_DB: postgres
3030
POSTGRES_PASSWORD: postgres
31-
# Note that these ports are ignored by the devcontainer.
32-
# Instead, the ports are specified in .devcontainer/devcontainer.json.
33-
# ports:
34-
# - "5432:5432"
31+
ports:
32+
- "5432:5432" # For non-devcontainer local usage
3533
volumes:
3634
postgres-data:

.github/workflows/rspec-system.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
if: ${{ failure() }}
8787
uses: actions/upload-artifact@v4
8888
with:
89-
name: failed-browser-tests
89+
name: failed-browser-tests-${{ matrix.ci_node_index }}
9090
path: |
9191
tmp/screenshots
9292
tmp/capybara

Gemfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ end
1010
# User management and login workflow.
1111
gem "devise", '>= 4.7.1'
1212
# Postgres database adapter.
13-
gem "pg", "~> 1.6.1"
13+
gem "pg", "~> 1.6.2"
1414
# Web server.
1515
gem "puma"
1616
# Rails web framework.
@@ -151,7 +151,7 @@ group :development, :test do
151151
# Debugger which supports rdbg and Shopify Ruby LSP VSCode extension
152152
gem "debug", ">= 1.0.0"
153153
# RSpec behavioral testing framework for Rails.
154-
gem "rspec-rails", "~> 8.0.0"
154+
gem "rspec-rails", "~> 8.0.2"
155155
# Static analysis / linter.
156156
gem "rubocop"
157157
# Rails add-on for static analysis.
@@ -160,7 +160,7 @@ group :development, :test do
160160
# More concise test ("should") matchers
161161
gem "shoulda-matchers", "~> 6.5"
162162
# Default rules for Rubocop.
163-
gem "standard", "~> 1.50"
163+
gem "standard", "~> 1.52"
164164
gem "standard-rails"
165165
gem "standard-performance"
166166
# Erb linter.
@@ -208,7 +208,7 @@ group :test do
208208
# Show code coverage.
209209
gem 'simplecov'
210210
# Mock HTTP requests and ensure they are not called during tests.
211-
gem "webmock", "~> 3.25"
211+
gem "webmock", "~> 3.26"
212212
# Interface capybara to chrome headless
213213
gem "cuprite"
214214
# Read PDF files for tests

0 commit comments

Comments
 (0)