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

Update everything #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,11 @@
db/*.sqlite3
log/*.log
tmp/
/public/system
/public/uploads
/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
28 changes: 28 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
require:
- rubocop-performance
- rubocop-rails

AllCops:
TargetRailsVersion: 6.0
TargetRubyVersion: 2.7
NewCops: enable
Exclude:
- 'bin/*'
- 'db/**/*'
- 'node_modules/**/*'
- 'public/**/*'
- 'tmp/**/*'
- 'vendor/bundle/**/*'

Layout/LineLength:
Enabled: false

Metrics/BlockLength:
Exclude:
- 'config/**/*'

Rails/HasAndBelongsToMany:
Enabled: false

Style/Documentation:
Enabled: false
63 changes: 44 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,47 @@
source 'http://rubygems.org'

gem 'rails', '~> 3.1'
gem 'cancan'
gem 'devise', '~> 1.4'
gem 'rails_admin', :git => 'git://github.com/sferik/rails_admin.git'
gem 'mlb', '~> 0.5'
gem 'paperclip', '~> 2.4'
gem 'mini_magick'
gem 'carrierwave'
gem 'dragonfly'
group :production do
gem 'pg'
end
# frozen_string_literal: true

source 'https://rubygems.org'

ruby '2.7.2'

gem 'rails', '6.0.3.4'

gem 'bootsnap', '~> 1.4', require: false
gem 'puma', '~> 5.0'

gem 'webpacker', '~> 5.2'

gem 'cancancan', '~> 3.1'
gem 'carrierwave', '~> 2.1'
gem 'devise', '~> 4.7'
gem 'dragonfly', '~> 1.2'
gem 'kt-paperclip', '~> 6.3'
gem 'mini_magick', '~> 4.10'
gem 'mlb', '~> 0.7.0'
gem 'paper_trail', '~> 11.0'
gem 'paper_trail-association_tracking', '~> 2.1'
gem 'rails_admin', github: 'sferik/rails_admin'

gem 'sassc-rails', '~> 2.1'
gem 'uglifier', '~> 4.2'

group :development, :test do
gem 'sqlite3'
gem 'sqlite3', '~> 1.4'
end
group :assets do
gem 'sass-rails', '~> 3.1'
gem 'coffee-rails', '~> 3.1'
gem 'uglifier', '~> 1.0'

group :development do
gem 'listen', '~> 3.2'
gem 'rubocop', '~> 1.0', require: false
gem 'rubocop-performance', '~> 1.8', require: false
gem 'rubocop-rails', '~> 2.8', require: false
gem 'spring', '~> 2.1'
gem 'spring-watcher-listen', '~> 2.0'
gem 'web-console', '~> 4.0'
end

group :production do
gem 'pg', '~> 1.2'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Loading