Skip to content

Commit

Permalink
Merge pull request #57 from JuzerShakir/upgrade-rails-7.2
Browse files Browse the repository at this point in the history
Upgrade rails to 7.2.2.1
  • Loading branch information
JuzerShakir authored Dec 11, 2024
2 parents b996bb6 + 016db84 commit d6cddf0
Show file tree
Hide file tree
Showing 62 changed files with 1,599 additions and 563 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,6 @@
/app/assets/builds/*
!/app/assets/builds/.keep
/public/assets

# Ignore CI service files.
/.github
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: 2
updates:
- package-ecosystem: bundler
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
8 changes: 6 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- name: Setting up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: .ruby-version
bundler-cache: true

- name: Setup Node
Expand All @@ -48,14 +49,17 @@ jobs:
gem install bundler
bundle install --jobs 4 --retry 3
- name: Scan for common Rails security vulnerabilities using static analysis
run: bundle exec brakeman

- name: Find linting errors
run: bundle exec erblint -l

- name: Find rubocop errors
run: bundle exec rubocop
run: bin/rubocop

- name: Precompile assets
run: yarn run build
run: bundle exec rails assets:precompile

- name: Running Tests
env:
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
# Temporary files generated by your text editor or operating system belong in git's global ignore instead:
# `$XDG_CONFIG_HOME/git/ignore` or `~/.config/git/ignore`

# Ignore bundler config.
/.bundle
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN apt-get update -qq && \

# Install JavaScript dependencies
ARG NODE_VERSION=18.18.1
ARG YARN_VERSION=1.22.19
ARG YARN_VERSION=1.22.22
ENV PATH=/usr/local/node/bin:$PATH
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
/tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
Expand Down
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "~> 3.3.6"

gem "rails", "~> 7.1.5"
gem "rails", "~> 7.2.2"

gem "active_record_union"
gem "bcrypt", "~> 3.1.20"
Expand Down Expand Up @@ -33,11 +33,15 @@ gem "validates_email_format_of", "~> 1.8.2"
gem "validates_timeliness", "~> 7.0.0"

group :development, :test do
gem "debug", platforms: %i[mri mingw x64_mingw]
# Static analysis for security vulnerabilities [https://brakemanscanner.org/]
gem "brakeman", require: false
gem "debug", platforms: %i[mri windows], require: "debug/prelude"
gem "factory_bot_rails", "~> 6.4.0"
gem "rspec-rails", "~> 7.1.0"
gem "rubocop-rails", "2.27.0", require: false
gem "rubocop-rspec_rails", require: false
gem "rubocop-factory_bot", "~> 2.26", ">= 2.26.1", require: false
gem "rubocop-capybara", "~> 2.21", require: false
gem "rubocop-performance", require: false
gem "rubocop-rspec", require: false
gem "standard", require: false
Expand Down
Loading

0 comments on commit d6cddf0

Please sign in to comment.