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.

Sign up for GitHub

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

Jump to bottom

Add Appraisal for Rails 6.1-rc2 #175

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Add Appraisal for Rails 6.1-rc2 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ebb4b0
Add Appraisal for Rails 6.1-rc2
bensheldon Dec 8, 2020
64f7fa8
Add linter gems to an ignorable gem group for compatibility with Ruby…
bensheldon Dec 8, 2020
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,9 @@ jobs:
- name: Install bundler
run: gem update --system && gem install bundler --default -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -1 | tr -d " ")
- name: Install Gemfile gems
run: bundle install
run: bundle install --without lint
- name: Install Appraisal gems
run: bundle exec appraisal install --path $BUNDLE_PATH
run: bundle exec appraisal install --without lint --path $BUNDLE_PATH
# /Dependencies

- name: Set up test database
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
end

appraise "rails-6.1" do
gem "rails", "~> 6.1-rc2"
end

appraise "rails-head" do
gem "rails", github: "rails/rails", branch: "master"
end
9 changes: 9 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,12 @@ gemspec

# To use a debugger
# gem 'byebug', group: [:development, :test]
#
group :lint do
gem "erb_lint"
gem "mdl"
gem "rubocop"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rspec"
end
0 engine/app/views/assets/_style.css.erb → engine/app/assets/style.css
View file
Open in desktop
File renamed without changes.
0 ...vendor/bootstrap/_bootstrap-native.js.erb → ...sets/vendor/bootstrap/bootstrap-native.js
View file
Open in desktop
File renamed without changes.
0 ...views/vendor/bootstrap/_bootstrap.css.erb → ...app/assets/vendor/bootstrap/bootstrap.css
View file
Open in desktop
File renamed without changes.
0 ...p/views/vendor/chartist/_chartist.css.erb → ...e/app/assets/vendor/chartist/chartist.css
View file
Open in desktop
File renamed without changes.
0 ...pp/views/vendor/chartist/_chartist.js.erb → ...ne/app/assets/vendor/chartist/chartist.js
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions engine/app/views/layouts/good_job/base.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<title>Good job</title>
<title>Good Job Dashboard</title>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>

<style>
<%= render "vendor/bootstrap/bootstrap.css" %>
<%= render "vendor/chartist/chartist.css" %>
<%= render "assets/style.css" %>
<%= render file: GoodJob::Engine.root.join("app", "assets", "vendor", "bootstrap", "bootstrap.css") %>
<%= render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartist", "chartist.css") %>
<%= render file: GoodJob::Engine.root.join("app", "assets", "style.css") %>
</style>

<script>
<%= render "vendor/bootstrap/bootstrap-native.js" %>
<%= render "vendor/chartist/chartist.js" %>
<%= render file: GoodJob::Engine.root.join("app", "assets", "vendor", "bootstrap", "bootstrap-native.js") %>
<%= render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartist", "chartist.js") %>
</script>
</head>
<body>
Expand Down
70 changes: 3 additions & 67 deletions gemfiles/rails_5.2.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,6 @@ GEM
rake
thor (>= 0.14.0)
arel (9.0.0)
ast (2.4.1)
better_html (1.0.15)
actionview (>= 4.0)
activesupport (>= 4.0)
ast (~> 2.0)
erubi (~> 1.4)
html_tokenizer (~> 0.0.6)
parser (>= 2.4)
smart_properties
builder (3.2.4)
capybara (3.33.0)
addressable
Expand All @@ -79,23 +70,14 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
chef-utils (16.6.14)
childprocess (3.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crass (1.0.6)
database_cleaner (1.8.5)
diff-lcs (1.4.4)
dotenv (2.7.6)
erb_lint (0.0.35)
activesupport
better_html (~> 1.0.7)
html_tokenizer
parser (>= 2.7.1.4)
rainbow
rubocop (~> 0.79)
smart_properties
erubi (1.9.0)
erubi (1.10.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
Expand All @@ -114,36 +96,24 @@ GEM
retriable (~> 3.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
html_tokenizer (0.0.7)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
loofah (2.7.0)
loofah (2.8.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
mdl (0.11.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
method_source (1.0.0)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
mixlib-shellout (3.1.6)
chef-utils
msgpack (1.3.3)
multi_json (1.15.0)
multipart-post (2.1.1)
Expand All @@ -154,9 +124,6 @@ GEM
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
optimist (3.0.1)
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -219,28 +186,6 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.4)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.0.1)
parser (>= 2.7.1.5)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.87.0)
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
ruby-progressbar (1.10.1)
ruby2_keywords (0.0.2)
rubyzip (2.3.0)
sawyer (0.8.2)
Expand All @@ -250,7 +195,6 @@ GEM
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sigdump (0.2.4)
smart_properties (1.15.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -260,10 +204,8 @@ GEM
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
tomlrb (1.3.0)
tzinfo (1.2.7)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -282,23 +224,17 @@ DEPENDENCIES
capybara
database_cleaner
dotenv
erb_lint
foreman
gem-release
github_changelog_generator
good_job!
kramdown
kramdown-parser-gfm
mdl
pry-rails
puma
rails (~> 5.2.0)
rbtrace
rspec-rails
rubocop
rubocop-performance
rubocop-rails
rubocop-rspec
selenium-webdriver
sigdump
yard
Expand Down
72 changes: 4 additions & 68 deletions gemfiles/rails_6.0.gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,6 @@ GEM
bundler
rake
thor (>= 0.14.0)
ast (2.4.1)
better_html (1.0.15)
actionview (>= 4.0)
activesupport (>= 4.0)
ast (~> 2.0)
erubi (~> 1.4)
html_tokenizer (~> 0.0.6)
parser (>= 2.4)
smart_properties
builder (3.2.4)
capybara (3.33.0)
addressable
Expand All @@ -92,23 +83,14 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
chef-utils (16.6.14)
childprocess (3.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crass (1.0.6)
database_cleaner (1.8.5)
diff-lcs (1.4.4)
dotenv (2.7.6)
erb_lint (0.0.35)
activesupport
better_html (~> 1.0.7)
html_tokenizer
parser (>= 2.7.1.4)
rainbow
rubocop (~> 0.79)
smart_properties
erubi (1.9.0)
erubi (1.10.0)
faraday (1.1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
Expand All @@ -127,36 +109,24 @@ GEM
retriable (~> 3.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
html_tokenizer (0.0.7)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
loofah (2.7.0)
loofah (2.8.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
mdl (0.11.0)
kramdown (~> 2.3)
kramdown-parser-gfm (~> 1.1)
mixlib-cli (~> 2.1, >= 2.1.1)
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
method_source (1.0.0)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
mixlib-shellout (3.1.6)
chef-utils
msgpack (1.3.3)
multi_json (1.15.0)
multipart-post (2.1.1)
Expand All @@ -167,9 +137,6 @@ GEM
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
optimist (3.0.1)
parallel (1.19.2)
parser (2.7.2.0)
ast (~> 2.4.1)
pg (1.2.3)
pry (0.13.1)
coderay (~> 1.1)
Expand Down Expand Up @@ -234,28 +201,6 @@ GEM
rspec-mocks (~> 3.9)
rspec-support (~> 3.9)
rspec-support (3.9.4)
rubocop (0.93.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
rexml
rubocop-ast (>= 0.6.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.0.1)
parser (>= 2.7.1.5)
rubocop-performance (1.8.1)
rubocop (>= 0.87.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.8.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.87.0)
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
ruby-progressbar (1.10.1)
ruby2_keywords (0.0.2)
rubyzip (2.3.0)
sawyer (0.8.2)
Expand All @@ -265,7 +210,6 @@ GEM
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sigdump (0.2.4)
smart_properties (1.15.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
Expand All @@ -275,10 +219,8 @@ GEM
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
tomlrb (1.3.0)
tzinfo (1.2.7)
tzinfo (1.2.8)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -287,7 +229,7 @@ GEM
yard (0.9.25)
yard-activesupport-concern (0.0.1)
yard (>= 0.8)
zeitwerk (2.4.0)
zeitwerk (2.4.2)

PLATFORMS
ruby
Expand All @@ -297,23 +239,17 @@ DEPENDENCIES
capybara
database_cleaner
dotenv
erb_lint
foreman
gem-release
github_changelog_generator
good_job!
kramdown
kramdown-parser-gfm
mdl
pry-rails
puma
rails (~> 6.0.0)
rbtrace
rspec-rails
rubocop
rubocop-performance
rubocop-rails
rubocop-rspec
selenium-webdriver
sigdump
yard
Expand Down
Loading