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

Remove Appraisal gemfile locks #201

Merged
merged 1 commit into from
Jan 22, 2021
Merged
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
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ steps.ruby_version.outputs.value }}
bundler: none
- name: Ruby gem cache
uses: actions/cache@v1
with:
Expand Down Expand Up @@ -84,6 +85,7 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler: none
- name: Ruby gem cache
uses: actions/cache@v1
with:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ spec/test_app/tmp/
.env
doc
.yardoc
gemfiles/*.gemfile.lock
2 changes: 1 addition & 1 deletion Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ end
unless RUBY_PLATFORM.include?('java')
# activerecord-jdbcpostgresql-adapter does not have a compatible version
appraise "rails-head" do
gem "rails", github: "rails/rails", branch: "master"
gem "rails", github: "rails/rails", branch: "main"
end
end
92 changes: 49 additions & 43 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@ PATH
GEM
remote: https://rubygems.org/
specs:
actionpack (6.1.0)
actionview (= 6.1.0)
activesupport (= 6.1.0)
actionpack (6.1.1)
actionview (= 6.1.1)
activesupport (= 6.1.1)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.0)
activesupport (= 6.1.0)
actionview (6.1.1)
activesupport (= 6.1.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.1.0)
activesupport (= 6.1.0)
activejob (6.1.1)
activesupport (= 6.1.1)
globalid (>= 0.3.6)
activemodel (6.1.0)
activesupport (= 6.1.0)
activerecord (6.1.0)
activemodel (= 6.1.0)
activesupport (= 6.1.0)
activemodel (6.1.1)
activesupport (= 6.1.1)
activerecord (6.1.1)
activemodel (= 6.1.1)
activesupport (= 6.1.1)
activerecord-jdbc-adapter (61.0-java)
activerecord (~> 6.1.0)
activerecord-jdbcpostgresql-adapter (61.0-java)
activerecord-jdbc-adapter (= 61.0)
jdbc-postgres (>= 9.4, < 43)
activesupport (6.1.0)
activesupport (6.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -68,28 +68,30 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (~> 1.5)
xpath (~> 3.2)
chef-utils (16.8.14)
chef-utils (16.9.29)
childprocess (3.0.0)
coderay (1.1.3)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
crass (1.0.6)
database_cleaner (1.8.5)
diff-lcs (1.4.4)
dotenv (2.7.6)
erb_lint (0.0.35)
erb_lint (0.0.37)
activesupport
better_html (~> 1.0.7)
html_tokenizer
parser (>= 2.7.1.4)
rainbow
rubocop (~> 0.79)
rubocop
smart_properties
erubi (1.10.0)
faraday (1.2.0)
faraday (1.3.0)
faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-http-cache (2.2.0)
faraday (>= 0.8)
faraday-net_http (1.0.1)
ffi (1.14.2)
ffi (1.14.2-java)
foreman (0.87.2)
Expand All @@ -105,14 +107,14 @@ GEM
globalid (0.4.2)
activesupport (>= 4.2.0)
html_tokenizer (0.0.7)
i18n (1.8.5)
i18n (1.8.7)
concurrent-ruby (~> 1.0)
jdbc-postgres (42.2.14)
kramdown (2.3.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
loofah (2.8.0)
loofah (2.9.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mdl (0.11.0)
Expand All @@ -123,8 +125,8 @@ GEM
mixlib-shellout
method_source (1.0.0)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
mini_portile2 (2.5.0)
minitest (5.14.3)
mixlib-cli (2.1.8)
mixlib-config (3.0.9)
tomlrb
Expand All @@ -135,9 +137,11 @@ GEM
multipart-post (2.1.1)
nio4r (2.5.4)
nio4r (2.5.4-java)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.10-java)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.1-java)
racc (~> 1.4)
octokit (4.20.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
Expand All @@ -160,6 +164,8 @@ GEM
nio4r (~> 2.0)
puma (5.1.1-java)
nio4r (~> 2.0)
racc (1.5.2)
racc (1.5.2-java)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
Expand All @@ -168,9 +174,9 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (6.1.0)
actionpack (= 6.1.0)
activesupport (= 6.1.0)
railties (6.1.1)
actionpack (= 6.1.1)
activesupport (= 6.1.1)
method_source
rake (>= 0.8.7)
thor (~> 1.0)
Expand Down Expand Up @@ -200,29 +206,29 @@ GEM
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.1)
rubocop (0.93.1)
rubocop (1.8.1)
parallel (~> 1.10)
parser (>= 2.7.1.5)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 0.6.0)
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.3.0)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.0)
parser (>= 2.7.1.5)
rubocop-performance (1.9.1)
rubocop-performance (1.9.2)
rubocop (>= 0.90.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-rails (2.9.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 0.90.0, < 2.0)
rubocop-rspec (1.44.1)
rubocop (~> 0.87)
rubocop-ast (>= 0.7.1)
ruby-progressbar (1.10.1)
ruby2_keywords (0.0.2)
rubocop-rspec (2.1.0)
rubocop (~> 1.0)
rubocop-ast (>= 1.1.0)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
rubyzip (2.3.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
Expand All @@ -234,11 +240,11 @@ GEM
smart_properties (1.15.0)
spoon (0.0.6)
ffi
thor (1.0.1)
thor (1.1.0)
tomlrb (2.0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (1.7.0)
unicode-display_width (2.0.0)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.9.26)
Expand Down Expand Up @@ -280,4 +286,4 @@ DEPENDENCIES
yard-activesupport-concern

BUNDLED WITH
2.2.5
2.2.6
Loading