Skip to content

Commit

Permalink
Merge branch 'main' into operation-slot-machine
Browse files Browse the repository at this point in the history
  • Loading branch information
rosschapman committed May 28, 2024
2 parents 5f6a10e + 0eb2b05 commit f2f61fe
Show file tree
Hide file tree
Showing 46 changed files with 1,406 additions and 968 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/test-convene-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Update apt
env:
Expand All @@ -49,7 +49,7 @@ jobs:
bundler-cache: true

- name: Setup Node with cache
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'yarn'
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
--health-retries 5
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Update apt
env:
Expand All @@ -110,7 +110,7 @@ jobs:
bundler-cache: true

- name: Setup Node with cache
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'yarn'
Expand Down Expand Up @@ -149,15 +149,15 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Ruby and install gems
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: Setup Node with cache
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'yarn'
Expand Down
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ To run `pry` or `byebug`, run `bin/connect web`.
Guides: [`pry`](http://pry.github.io/) | [`byebug`](https://github.com/deivid-rodriguez/byebug/blob/master/GUIDE.md)

### 2.3. Using the devcontainer.

The devcontainer workflow was disabled on 2024/05/22, see https://github.com/zinc-collective/convene/issues/2415 for rationale. If you want to re-enable it, let one of the maintainers know.

We have setup a developer container environment using VS Code's Dev Containers extension.
Please see [this document](docs/devcontainer-usage.md) for instructions on using.

Expand Down
12 changes: 7 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ gem "turbo-rails"
# API Layer
#
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem "jbuilder", "~> 2.11"
gem "jbuilder", "~> 2.12"
gem "rswag-api"
gem "rswag-ui"

Expand All @@ -42,12 +42,12 @@ gem "redcarpet", "~> 3.6"
gem "gretel", "~> 5.0"
# Better UI components
gem "lookbook", ">= 2.0.0.beta.4"
gem "view_component", "~> 3.11"
gem "view_component", "~> 3.12"
# QR Code Generation!
gem "rqrcode", "~> 2.2"

# Pagination!
gem "pagy", "~> 8.2"
gem "pagy", "~> 8.4"

# Database Layer
#
Expand All @@ -58,6 +58,8 @@ gem "active_record_extended", "~> 3.2"
gem "activerecord-postgres_enum", "~> 2.0"
# Support for models with "slots" or "positions"
gem "ranked-model", "~> 0.4.9"
gem "positioning"

# Slug-based model lookup
gem "friendly_id", "~> 5.5.1"
# Hashing / Encrypting data at rest
Expand All @@ -78,7 +80,7 @@ gem "pg", "~> 1.5"
gem "image_processing"

# Use S3 for file storage
gem "aws-sdk-s3", "~> 1.146", require: false
gem "aws-sdk-s3", "~> 1.151", require: false
# Date/Time and Internationalization
#
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down Expand Up @@ -129,7 +131,7 @@ group :development, :test do

gem "rubocop-rails"
gem "rubocop-rspec"
gem "standard", "~> 1.35"
gem "standard", "~> 1.36"
end

group :development do
Expand Down
Loading

0 comments on commit f2f61fe

Please sign in to comment.