Compare commits
No commits in common. "main" and "public-access-website" have entirely different histories.
main
...
public-acc
@ -23,7 +23,7 @@ jobs:
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
ref: ${{ github.head_ref }} # Checkout the actual branch, not the result if merged into the base
|
||||
- uses: ruby/setup-ruby@v1
|
||||
- uses: ruby/setup-ruby@v1.220.0
|
||||
- run: bundle install
|
||||
- &postgres_wait
|
||||
name: Wait until Postgres is ready to accept connections
|
||||
@ -65,29 +65,26 @@ jobs:
|
||||
if: failure()
|
||||
run: docker ps --filter network=$JOB_CONTAINER_NAME-$GITHUB_JOB-network --filter name=$JOB_CONTAINER_NAME-* --format "{{.ID}}" | xargs docker rm -f
|
||||
rubocop:
|
||||
if: github.event_name == 'pull_request'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
- uses: ruby/setup-ruby@v1
|
||||
- uses: ruby/setup-ruby@v1.220.0
|
||||
- run: bundle install
|
||||
- run: bundle exec rubocop --force-exclusion --parallel
|
||||
check-licenses:
|
||||
if: github.event_name == 'pull_request'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
token: ${{ secrets.GITHUB_TOKEN }}
|
||||
- uses: ruby/setup-ruby@v1
|
||||
- uses: ruby/setup-ruby@v1.220.0
|
||||
- name: Install project dependencies
|
||||
run: bundle install --jobs `getconf _NPROCESSORS_ONLN`
|
||||
- name: Run license finder
|
||||
run: license_finder
|
||||
copyright_notice:
|
||||
if: github.event_name == 'pull_request'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
@ -124,6 +121,9 @@ jobs:
|
||||
timeout-minutes: 30
|
||||
needs:
|
||||
- unit_tests
|
||||
- rubocop
|
||||
- check-licenses
|
||||
- copyright_notice
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
|
@ -1 +1 @@
|
||||
ruby-3.4.3
|
||||
ruby-3.4.2
|
||||
|
@ -1,7 +1,7 @@
|
||||
# syntax = docker/dockerfile:1
|
||||
|
||||
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
|
||||
ARG RUBY_VERSION=3.4.3
|
||||
ARG RUBY_VERSION=3.4.2
|
||||
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
|
||||
|
||||
# Rails app lives here
|
||||
|
@ -1,7 +1,7 @@
|
||||
# syntax = docker/dockerfile:1
|
||||
|
||||
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
|
||||
ARG RUBY_VERSION=3.4.3
|
||||
ARG RUBY_VERSION=3.4.2
|
||||
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
|
||||
|
||||
# Rails app lives here
|
||||
|
2
Gemfile
2
Gemfile
@ -2,7 +2,7 @@
|
||||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
ruby '3.4.3'
|
||||
ruby '3.4.2'
|
||||
gem 'bootsnap', require: false
|
||||
gem 'csv'
|
||||
gem 'importmap-rails'
|
||||
|
10
Gemfile.lock
10
Gemfile.lock
@ -339,7 +339,7 @@ GEM
|
||||
rswag-ui (2.16.0)
|
||||
actionpack (>= 5.2, < 8.1)
|
||||
railties (>= 5.2, < 8.1)
|
||||
rubocop (1.76.1)
|
||||
rubocop (1.76.0)
|
||||
json (~> 2.3)
|
||||
language_server-protocol (~> 3.17.0.2)
|
||||
lint_roller (~> 1.1.0)
|
||||
@ -350,7 +350,7 @@ GEM
|
||||
rubocop-ast (>= 1.45.0, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 2.4.0, < 4.0)
|
||||
rubocop-ast (1.45.1)
|
||||
rubocop-ast (1.45.0)
|
||||
parser (>= 3.3.7.2)
|
||||
prism (~> 1.4)
|
||||
rubocop-factory_bot (2.27.1)
|
||||
@ -600,8 +600,8 @@ CHECKSUMS
|
||||
rswag-api (2.16.0) sha256=b653f7bd92e98be18b01ab4525d88950d7b0960e293a99f856b9efcee3ae6074
|
||||
rswag-specs (2.16.0) sha256=8ba26085c408b0bd2ed21dc8015c80f417c7d34c63720ab7133c2549b5bd2a91
|
||||
rswag-ui (2.16.0) sha256=a1f49e927dceda92e6e6e7c1000f1e217ee66c565f69e28131dc98b33cd3a04f
|
||||
rubocop (1.76.1) sha256=e15a2d750794cf2157d2de8b1b403dfa71b8dc3957a22ae6043b1bdf21e7e0e7
|
||||
rubocop-ast (1.45.1) sha256=94042e49adc17f187ba037b33f941ba7398fede77cdf4bffafba95190a473a3e
|
||||
rubocop (1.76.0) sha256=b7515398e1280b3cb7e3e0c429933ca3597ea43b7d0f03cb3c2d97719851c411
|
||||
rubocop-ast (1.45.0) sha256=0b4ade77d15f25b9e07214fb42fa98164f5316accea525e14e44bbb8f06f78d7
|
||||
rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
|
||||
rubocop-rails (2.32.0) sha256=9fcc623c8722fe71e835e99c4a18b740b5b0d3fb69915d7f0777f00794b30490
|
||||
rubocop-rspec (3.6.0) sha256=c0e4205871776727e54dee9cc91af5fd74578001551ba40e1fe1a1ab4b404479
|
||||
@ -634,7 +634,7 @@ CHECKSUMS
|
||||
zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
|
||||
|
||||
RUBY VERSION
|
||||
ruby 3.4.3p32
|
||||
ruby 3.4.2p28
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.1
|
||||
|
@ -6,9 +6,6 @@ require 'csv'
|
||||
|
||||
class GuestsController < ApplicationController
|
||||
GUEST_PARAMS = { only: %i[id name status], include: { group: { only: %i[id name] } } }.freeze
|
||||
|
||||
skip_before_action :authenticate_user!, only: :update
|
||||
|
||||
def index
|
||||
render json: Guest.includes(:group)
|
||||
.left_joins(:group)
|
||||
@ -34,6 +31,6 @@ class GuestsController < ApplicationController
|
||||
private
|
||||
|
||||
def guest_params
|
||||
user_signed_in? ? params.expect(guest: %i[name group_id status]) : params.expect(guest: %i[status])
|
||||
params.expect(guest: %i[name group_id status])
|
||||
end
|
||||
end
|
||||
|
@ -2,9 +2,9 @@
|
||||
|
||||
# frozen_string_literal: true
|
||||
|
||||
class InvitationsController < ApplicationController
|
||||
skip_before_action :authenticate_user!, only: :show
|
||||
# Copyright (C) 2024-2025 LibreWeddingPlanner contributors
|
||||
|
||||
class InvitationsController < ApplicationController
|
||||
def index
|
||||
render json: Invitation.includes(:guests).as_json(
|
||||
only: :id,
|
||||
@ -16,16 +16,6 @@ class InvitationsController < ApplicationController
|
||||
)
|
||||
end
|
||||
|
||||
def show
|
||||
invitation = Invitation.includes(:guests).find(params[:id])
|
||||
|
||||
if invitation
|
||||
render json: invitation, only: :id, include: { guests: { only: %i[id name status] } }, status: :ok
|
||||
else
|
||||
render json: { error: 'Invitation not found' }, status: :not_found
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
invitation = Invitation.create
|
||||
|
||||
|
@ -42,7 +42,7 @@ Rails.application.routes.draw do
|
||||
|
||||
resources :tables_arrangements, only: %i[index show create]
|
||||
resources :summary, only: :index
|
||||
resources :invitations, only: %i[show index create update destroy]
|
||||
resources :invitations, only: %i[index create update destroy]
|
||||
|
||||
root to: redirect("/%{slug}")
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user