Skip to content

Commit

Permalink
Merge pull request #688 from bitzesty/staging
Browse files Browse the repository at this point in the history
Production release
  • Loading branch information
DaniBitZesty authored Apr 23, 2024
2 parents 1f5ea9d + c66c941 commit a40c83f
Show file tree
Hide file tree
Showing 17 changed files with 569 additions and 465 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
ruby-version: 3.2.3
- uses: actions/setup-node@v2-beta
with:
node-version: '16'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ rspec.watchr
.pgpass
certs/*
.env
.env.development.local
.history/

*.swp
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.2.3
2 changes: 2 additions & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ruby 3.2.3
nodejs 16.14.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.2.2
ARG RUBY_VERSION=3.2.3

FROM ruby:${RUBY_VERSION}

Expand All @@ -7,7 +7,7 @@ WORKDIR /app

RUN apt-get update
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash -
RUN apt-get install -y nodejs npm
RUN apt-get install -y nodejs
RUN npm install yarn -g

# ENV SSL_CERT_DIR=/etc/ssl/certs
Expand Down
10 changes: 5 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source 'https://rubygems.org'

git_source(:github) { |name| "https://github.com/#{name}.git" }

ruby '~> 3.2.2'
ruby '~> 3.2.3'

gem 'rails', '7.1.1'
gem 'rails', '7.1.3.2'
gem 'websocket-extensions', '~> 0.1.5'

# SSL redirect
Expand All @@ -23,7 +23,7 @@ gem 'sprockets-rails', '>= 2.0.0'
gem 'slim-rails', '~> 3.2.0'
gem 'coffee-rails', '5.0'
gem 'jquery-rails', '~> 4.4'
gem 'jquery-ui-rails', '6.0.1'
gem 'jquery-ui-rails', github: 'jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0'
gem 'bootstrap-sass', '~> 3.4'
gem 'govuk_frontend_toolkit', '~> 3.1.0'
gem 'govuk_template', '0.12.0'
Expand Down Expand Up @@ -84,7 +84,7 @@ gem 'prawn-table'
gem 'nokogiri'

# Uploads
gem 'carrierwave', '~> 2.2.5'
gem 'carrierwave', '~> 2.2.6'
gem 'google-cloud-storage', '~> 1.34.1'
gem 'carrierwave-google-storage', github: "bitzesty/carrierwave-google-storage", ref: 'c706a21c6c25045cae2e39bcab5bf594af0bcf46'
gem 'vigilion', '~> 1.0.4', github: 'vigilion/vigilion-ruby', ref: '7d6a7e5'
Expand Down Expand Up @@ -121,7 +121,7 @@ gem 'nilify_blanks'

# We use it for sending API requests to Sendgrid in
# AdvancedEmailValidator
gem 'curb', '0.9.10'
gem 'curb', '~> 1.0.5'

# Web server
gem 'puma', '~> 5.6.8'
Expand Down
Loading

0 comments on commit a40c83f

Please sign in to comment.