Skip to content

Commit

Permalink
Merge branch 'master' into user_select-size#4679
Browse files Browse the repository at this point in the history
  • Loading branch information
tanmoysrt authored Mar 7, 2024
2 parents 25a9e46 + f6992d1 commit ae7f4b1
Show file tree
Hide file tree
Showing 102 changed files with 2,669 additions and 1,943 deletions.
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
},
"waitFor": "onCreateCommand",
"initializeCommand": "git submodule update --init --recursive",
"postCreateCommand": ".devcontainer/setup.sh",
"postAttachCommand": {
"server": ".devcontainer/boot.sh"
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh

git submodule update --init --recursive
# Setup database
cp config/database.docker.yml config/database.yml
createuser -s postgres
Expand Down
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ version: 2
updates:
- package-ecosystem: npm
directory: "/"
groups:
minor-and-patch:
update-types:
- "minor"
- "patch"
schedule:
interval: daily
open-pull-requests-limit: 10
Expand All @@ -10,6 +15,11 @@ updates:
directory: "/"
schedule:
interval: daily
groups:
minor-and-patch:
update-types:
- "minor"
- "patch"
open-pull-requests-limit: 10

- package-ecosystem: "docker"
Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodejs 18.18.2
ruby 3.2.0
ruby 3.3.0
yarn 1.22.19
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Please note: If you wanted to work on an issue, let us know by leaving a commen

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

## Community
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.
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

gem "rails_autolink"
gem "acts_as_votable", "~> 0.14.0"
gem "aws-sdk-rails"
gem "dotenv-rails", groups: %i[development test]
Expand All @@ -24,7 +25,7 @@ gem "view_component"
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem "rails", "~> 7.0"
# Use Puma as the app server
gem "puma", "~> 6.3"
gem "puma", "~> 6.4"
# Use SCSS for stylesheets
gem "sass-rails", "~> 6.0"
gem "terser"
Expand Down Expand Up @@ -162,6 +163,7 @@ group :development do
gem "sunspot_solr"
gem "bundler-audit", "~> 0.9.1"
gem 'database_consistency', require: false
gem "lookbook", ">= 2.2.0"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Expand Down
Loading

0 comments on commit ae7f4b1

Please sign in to comment.