Skip to content

Commit

Permalink
Merge pull request #1190 from railsbridge/use-nix
Browse files Browse the repository at this point in the history
Use nix and update some gems
  • Loading branch information
michaelglass authored May 5, 2021
2 parents 510dff5 + 08306d6 commit cb7e16b
Show file tree
Hide file tree
Showing 13 changed files with 386 additions and 154 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use nix
5 changes: 3 additions & 2 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This configuration was generated by
# `rubocop --auto-gen-config --auto-gen-only-exclude --exclude-limit 1000 --no-auto-gen-timestamp`
# using RuboCop version 1.6.1.
# using RuboCop version 1.13.0.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
Expand Down Expand Up @@ -188,7 +188,7 @@ RSpec/DescribeClass:
- 'spec/models/factory_spec.rb'

# Offense count: 172
# Configuration parameters: Max.
# Configuration parameters: Max, CountAsOne.
RSpec/ExampleLength:
Exclude:
- 'spec/controllers/admin_pages_controller_spec.rb'
Expand Down Expand Up @@ -425,6 +425,7 @@ Rake/MethodDefinitionInTask:
- 'lib/tasks/db.rake'

# Offense count: 138
# Configuration parameters: AllowedConstants.
Style/Documentation:
Exclude:
- 'app/controllers/admin_pages_controller.rb'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.2
2.7.1
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.7.2
- 2.7.1
cache:
bundler: true
yarn: true
Expand All @@ -17,17 +17,17 @@ env:

matrix:
include:
- env: FORCE_POSTGRES=true
services:
- postgresql
- env: DO_NOT_FORCE_POSTGRES=true
- env: FORCE_POSTGRES=true
services:
- postgresql
- env: DO_NOT_FORCE_POSTGRES=true

before_install:
- env
- nvm install 12
- yarn install
- google-chrome-stable --version
- 'echo ''gem: --no-document'' > ~/.gemrc'
- "echo 'gem: --no-document' > ~/.gemrc"
- gem update --system
- gem install bundler
- bundle config set --local deployment 'true'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source 'https://rubygems.org'

ruby '2.7.2'
ruby '2.7.1'

gem 'active_hash'
# OPTIMIZE: and cache expensive computations for faster boot times. It's
Expand Down Expand Up @@ -32,7 +32,7 @@ gem 'pundit'
gem 'rack-canonical-host'
gem 'rack-cors'
gem 'rack-mini-profiler', require: ['prepend_net_http_patch']
gem 'rails', '~> 5.2.4.3'
gem 'rails', '~> 5.2.5'
gem 'sanitize'
gem 'sassc-rails'
gem 'simple_form'
Expand Down
Loading

0 comments on commit cb7e16b

Please sign in to comment.