Skip to content

Commit

Permalink
Merge branch 'zinc-collective:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
zspencer authored Mar 25, 2024
2 parents 1ffbdd7 + 82217ff commit ece4a57
Show file tree
Hide file tree
Showing 55 changed files with 860 additions and 500 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/ruby:3.2
FROM mcr.microsoft.com/devcontainers/ruby:3.3

LABEL org.opencontainers.image.source=https://github.com/zinc-collective/convene-devcontainer
LABEL org.opencontainers.image.description="Container to facilitate easier development of convene, specifically to work in GitHub CodeSpaces."
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@ app/assets/builds/*

.devcontainer/output

TAGS
# # Ignore Bust A Gem VSCode extension ctags generation.
/TAGS

# Webpack Bundle Analyzer
webpack-stats.json
10 changes: 10 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ AllCops:
- vendor/bundle/**/*
NewCops: enable


RSpec/Capybara/FeatureMethods:
Exclude:
- '**/*_system_spec.rb'
- spec/system/**/*_spec.rb

RSpec/MultipleExpectations:
Enabled: false

Expand All @@ -29,6 +35,10 @@ RSpec/NestedGroups:

RSpec/ExampleLength:
Max: 10
Exclude:
- '**/*_system_spec.rb'
- spec/system/**/*_spec.rb


Style/TrailingCommaInArrayLiteral:
Exclude:
Expand Down
18 changes: 2 additions & 16 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 2000`
# on 2023-09-14 00:31:11 UTC using RuboCop version 1.56.3.
# on 2024-03-07 02:44:05 UTC using RuboCop version 1.61.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -32,12 +32,6 @@ RSpec/DescribeClass:
Exclude:
- 'spec/tasks/release_after_build_spec.rb'

# Offense count: 2
# Configuration parameters: Max, CountAsOne.
RSpec/ExampleLength:
Exclude:
- 'spec/requests/rsvps_controller_request_spec.rb'

# Offense count: 1
RSpec/LeakyConstantDeclaration:
Exclude:
Expand All @@ -57,14 +51,7 @@ RSpec/NamedSubject:
- 'spec/models/invitation_spec.rb'
- 'spec/models/membership_spec.rb'

# Offense count: 1
# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
# Include: **/*_spec.rb
RSpec/SpecFilePathFormat:
Exclude:
- 'spec/furniture/journal/entries_request_spec.rb'

# Offense count: 8
# Offense count: 6
# This cop supports safe autocorrection (--autocorrect).
# Configuration parameters: EnforcedStyle.
# SupportedStyles: slashes, arguments
Expand All @@ -73,7 +60,6 @@ Rails/FilePath:
- 'config/application.rb'
- 'config/environments/development.rb'
- 'config/initializers/gretel.rb'
- 'spec/rails_helper.rb'

# Offense count: 1
# Configuration parameters: Include.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.3
3.3.0
10 changes: 7 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,11 @@ First, ensure your development environment has:
1. Ruby (See [.ruby-version](./.ruby-version) for version)
2. Node (See [.nvmrc](./.nvmrc) for version)
3. [Yarn]
4. [PostgreSQL]. (Note: For people using [Docker], a [docker-compose.yml]
file has been included for convenience.)
4. [PostgreSQL]
5. [Redis]

(Note: If you use [Docker], a [docker-compose.yml] file has been included with
[PostgreSQL] and [Redis] for convenience.)

Then, run `bin/setup` to install Ruby and Node dependencies and set up the
database.
Expand All @@ -83,7 +86,8 @@ Log in with [email protected]. You can check the email using http://local
Finally, with the server still running (perhaps in a different terminal), run
`bin/test` to ensure that your development environment is configured correctly.

[PostgreSQL 12]: https://www.postgresql.org/download/
[PostgreSQL]: https://www.postgresql.org/
[Redis]: https://redis.io/
[Docker]: https://www.docker.com
[docker-compose.yml]: ./docker-compose.yml
[.env.development.example]: ./.env.development.example
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ gem "friendly_id", "~> 5.5.1"
gem "bcrypt", "~> 3.1.20"
gem "lockbox", "1.3.3"
gem "rotp", "~> 6.3"
gem "strong_migrations", "~> 1.7"
gem "strong_migrations", "~> 1.8"
# Soft Deletion
gem "discard", "~> 1.2"

Expand All @@ -78,7 +78,7 @@ gem "pg", "~> 1.5"
gem "image_processing"

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

# Our preferred testing library for Ruby and Rails projects
gem "rails-controller-testing"
gem "rspec-rails", "~> 6.1.1"
gem "rspec-rails", "~> 6.1.2"
gem "rswag-specs"
gem "shoulda-matchers", "~> 6.1"
gem "shoulda-matchers", "~> 6.2"

gem "capybara"
gem "selenium-webdriver"
Expand All @@ -129,7 +129,7 @@ group :development, :test do

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

group :development do
Expand Down
Loading

0 comments on commit ece4a57

Please sign in to comment.