Skip to content

Commit ae7f4b1

Browse files
authored
Merge branch 'master' into user_select-size#4679
2 parents 25a9e46 + f6992d1 commit ae7f4b1

File tree

102 files changed

+2669
-1943
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

+2669
-1943
lines changed

.devcontainer/devcontainer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
1010
},
1111
"waitFor": "onCreateCommand",
12-
"initializeCommand": "git submodule update --init --recursive",
1312
"postCreateCommand": ".devcontainer/setup.sh",
1413
"postAttachCommand": {
1514
"server": ".devcontainer/boot.sh"

.devcontainer/setup.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/sh
22

3+
git submodule update --init --recursive
34
# Setup database
45
cp config/database.docker.yml config/database.yml
56
createuser -s postgres

.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ version: 2
22
updates:
33
- package-ecosystem: npm
44
directory: "/"
5+
groups:
6+
minor-and-patch:
7+
update-types:
8+
- "minor"
9+
- "patch"
510
schedule:
611
interval: daily
712
open-pull-requests-limit: 10
@@ -10,6 +15,11 @@ updates:
1015
directory: "/"
1116
schedule:
1217
interval: daily
18+
groups:
19+
minor-and-patch:
20+
update-types:
21+
- "minor"
22+
- "patch"
1323
open-pull-requests-limit: 10
1424

1525
- package-ecosystem: "docker"

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodejs 18.18.2
2-
ruby 3.2.0
2+
ruby 3.3.0
33
yarn 1.22.19

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Please note: If you wanted to work on an issue, let us know by leaving a commen
1111

1212
- `maintainers` label are internal tasks that will be completed by a Circuitverse core team member.
1313
- [good first issue](https://github.com/CircuitVerse/CircuitVerse/labels/good%20first%20issue) labeled issues are meant for newer developers.
14+
- [pending triage](https://github.com/CircuitVerse/CircuitVerse/labels/pending%20triage) labeled issues are not verified by maintainers.
1415
- [feature](https://github.com/CircuitVerse/CircuitVerse/labels/%F0%9F%8C%9F%20feature) labeled issues are meant to propose new features.
1516
- [bugs](https://github.com/CircuitVerse/CircuitVerse/labels/%F0%9F%90%9E%20bug) labeled issues are meant to have errors in existing code base.
1617
- [documentation](https://github.com/CircuitVerse/CircuitVerse/labels/documentation) labeled issues are meant to have typo errors in documentation.
@@ -76,7 +77,7 @@ Please note: If you wanted to work on an issue, let us know by leaving a commen
7677
- `no activity` labeled PRs are meant to have no activity in the PR from since a while.
7778
- `blocked` labeled PRs are meant not to go ahead for review.
7879
- `do not merge` labeled PRs are meant not to merge the PR right now(may be later).
79-
- [awaiting-approval](https://github.com/CircuitVerse/CircuitVerse/labels/awaiting-approval) labeled PRs are meant to be waiting for other communtiy members.
80+
- [awaiting-approval](https://github.com/CircuitVerse/CircuitVerse/labels/awaiting-approval) labeled PRs are meant to be waiting for other community members.
8081

8182
## Community
8283
Discussions about CircuitVerse issues and features take place on the repository's [Discussions](https://github.com/CircuitVerse/CircuitVerse/discussions) sections. Anybody is welcome to join these conversations. See the [README](README.md) for more information on communication channels.

Gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8+
gem "rails_autolink"
89
gem "acts_as_votable", "~> 0.14.0"
910
gem "aws-sdk-rails"
1011
gem "dotenv-rails", groups: %i[development test]
@@ -24,7 +25,7 @@ gem "view_component"
2425
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
2526
gem "rails", "~> 7.0"
2627
# Use Puma as the app server
27-
gem "puma", "~> 6.3"
28+
gem "puma", "~> 6.4"
2829
# Use SCSS for stylesheets
2930
gem "sass-rails", "~> 6.0"
3031
gem "terser"
@@ -162,6 +163,7 @@ group :development do
162163
gem "sunspot_solr"
163164
gem "bundler-audit", "~> 0.9.1"
164165
gem 'database_consistency', require: false
166+
gem "lookbook", ">= 2.2.0"
165167
end
166168

167169
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

0 commit comments

Comments
 (0)