Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge sandbox into development #582

Merged
merged 13 commits into from
Jun 20, 2023
3 changes: 2 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ require:
- rubocop-performance
- rubocop-rails
- rubocop-rspec # or rubocop-minitest
- rubocop-factory_bot
AllCops:
NewCops: enable
Exclude:
Expand Down Expand Up @@ -76,7 +77,7 @@ Metrics/AbcSize:
Layout/LineLength:
Max: 120
Enabled: false
IgnoredPatterns:
AllowedPatterns:
- 'it .* do$'
- 'context .* do$'
- 'scenario .* do$'
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: bionic
language: ruby
rvm:
2.7.2
3.2.2
env:
matrix:
- API_ROOT=$deploy_api_uri
Expand Down
2 changes: 1 addition & 1 deletion CF/manifest-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ applications:
- name: conclave-cii-CF_SPACE
memory: SET_MEMORY
buildpacks:
- https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.42
- https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.0
instances: 1
random-route: true
routes:
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.2'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.6'
gem 'rails', '~> 7.0.5'
# Use sqlite3 as the database for Active Record
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
Expand All @@ -21,7 +21,7 @@ gem 'puma', '~> 4.3', '>= 4.3.12'
gem 'bootsnap', '>= 1.4.2', require: false
# for postgresql
gem 'activerecord-postgis-adapter', '>= 6.0.1'
gem 'pg', '~> 0.18.4'
gem 'pg'
gem 'jwt'
gem 'faraday'
gem 'faraday_middleware'
Expand Down
Loading