Skip to content

Commit

Permalink
chore: support rails 6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeCisco committed Jan 11, 2021
1 parent 60ea8f3 commit 42a58b1
Show file tree
Hide file tree
Showing 19 changed files with 8,020 additions and 156 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
6 changes: 3 additions & 3 deletions .forestadmin-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@
"validations": []
}, {
"field": "birth_date",
"type": "Date",
"type": "Dateonly",
"default_value": null,
"enums": null,
"integration": null,
Expand Down Expand Up @@ -3737,9 +3737,9 @@
}],
"meta": {
"database_type": "postgresql",
"framework_version": "5.2.1",
"framework_version": "6.0.0",
"liana": "forest-rails",
"liana_version": "5.2.2",
"orm_version": "5.2.1"
"orm_version": "6.0.0"
}
}
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,12 @@
.byebug_history

.env

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity

.idea
11 changes: 7 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ git_source(:github) do |repo_name|
end

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.0'
gem 'rails', '6.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
gem 'puma', '~> 5.1'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
gem 'sass-rails', '~> 6.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
Expand All @@ -31,7 +31,7 @@ gem 'jbuilder', '~> 2.5'
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootsnap', '~> 1.5.0', require: false

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand Down Expand Up @@ -63,3 +63,6 @@ gem 'actionpack-action_caching'
gem 'data_uri'
gem 'faker'
gem 'mixpanel_client'

gem "webpacker"
gem "pkg-config"
Loading

0 comments on commit 42a58b1

Please sign in to comment.