Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
90bc5a4
build(deps): bump rack from 2.2.6.3 to 2.2.6.4 (#3677)
dependabot[bot] Mar 24, 2023
3d85baf
build(deps): bump activesupport from 6.1.7.1 to 6.1.7.3 in /docs (#3680)
dependabot[bot] Mar 24, 2023
5ecb5a0
chore: update rails minor version to address vulnerabilty
tachyons Mar 24, 2023
f9506c1
i18n | Adding Marathi locale in circuitverse (#3696)
Waishnav Mar 25, 2023
df7d515
build(deps): bump puma from 5.6.4 to 6.1.1 (#3628)
dependabot[bot] Mar 25, 2023
c064c94
feat(ui): replace svg with user avatar , add avatar in the group card…
Arnabdaz Mar 25, 2023
e4b7461
feat: New group notification (#3389)
VaibhavUpreti Mar 25, 2023
f99189b
fix(ui): fix unalinged alert texts issue #3556 (#3557)
Arnabdaz Mar 25, 2023
4ab493b
fix(ui): comment text, fix multiline comments too much line spacing (…
Arnabdaz Mar 25, 2023
3cc5ea9
fix check-box tick to fit and correctly align in its container box (#…
Arnabdaz Mar 25, 2023
66d5db6
fix: style of the projectName so that it is visible completely (#3388)
Waishnav Mar 25, 2023
a7a97e2
build(deps): bump flipper-ui from 0.24.1 to 0.28.0 (#3693)
dependabot[bot] Mar 25, 2023
d815744
build(deps): bump ruby from 3.2.0-slim to 3.2.1-slim (#3625)
dependabot[bot] Mar 25, 2023
d4c00eb
build(deps-dev): bump @commitlint/cli from 17.0.2 to 17.5.0 (#3694)
dependabot[bot] Mar 25, 2023
6e68219
Revert "feat: New group notification (#3389)" (#3698)
tachyons Mar 25, 2023
dd7330c
Revert "[revamp] : announcement UI (#3526)" (#3707)
tachyons Mar 26, 2023
011a5ea
chore: removed old simulator reference from menu (#3717)
abhirajn Apr 5, 2023
1c8b33d
chore: update erb_linter and fix common issues in erb
tachyons Apr 7, 2023
199bfb3
fix: erb tags (#3756)
VaibhavUpreti May 25, 2023
283e75e
fix: Implemented_safe_recovery_from_simulator_crash
Prerna-0202 May 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .erb-lint.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
---
glob: "**/*.{html,text,js}{+*,}.erb"
exclude:
- '**/vendor/**/*'
- '**/node_modules/**/*'
linters:
ErbSafety:
enabled: true
Expand All @@ -11,3 +15,7 @@ linters:
Enabled: false
Metrics/LineLength:
Enabled: false
Layout/TrailingEmptyLines:
Enabled: false
Layout/InitialIndentation:
Enabled: false
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.0
FROM ruby:3.2.1

# set up workdir
RUN mkdir /circuitverse
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM ruby:3.2.0 as builder
FROM --platform=$BUILDPLATFORM ruby:3.2.1 as builder

ARG BUILDPLATFORM
ENV NODE_ENV=production
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN rm -rf node_modules spec

RUN bundle exec bootsnap precompile --gemfile app/ lib/

FROM --platform=$BUILDPLATFORM ruby:3.2.0-slim as app
FROM --platform=$BUILDPLATFORM ruby:3.2.1-slim as app

COPY --from=builder /usr/src/app /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,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", "~> 5.6"
gem "puma", "~> 6.1"
# Use SCSS for stylesheets
gem "sass-rails", "~> 6.0"
gem "terser"
Expand Down
Loading