Skip to content

Commit c3622fa

Browse files
alecclarkealecclarke
authored
Merge pull request #40 from clio/add-rails-6-compatibility
Add compatibility for Rails 6.0 and remove support for Rails 4.2
2 parents 701b23a + d9d14bf commit c3622fa

12 files changed

Lines changed: 193 additions & 229 deletions

‎gemfiles/Gemfile.rails-4.2-stable‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎gemfiles/Gemfile.rails-4.2-stable.lock‎

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎gemfiles/Gemfile.rails-5.0-stable.lock‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GIT
2-
remote: git://github.com/rails/rails.git
2+
remote: https://github.com/rails/rails.git
33
revision: ac6aa32f7cf66264ba87eabed7c042bb60bcf3a2
44
branch: 5-0-stable
55
specs:
@@ -18,36 +18,44 @@ GIT
1818
PATH
1919
remote: ..
2020
specs:
21-
polymorphic_integer_type (2.2.4)
22-
activerecord
21+
polymorphic_integer_type (2.3.1)
22+
activerecord (< 6.1)
2323

2424
GEM
2525
remote: https://rubygems.org/
2626
specs:
2727
arel (7.1.4)
28-
byebug (11.0.1)
29-
concurrent-ruby (1.1.5)
30-
diff-lcs (1.3)
31-
i18n (1.7.0)
28+
byebug (11.1.3)
29+
coderay (1.1.3)
30+
concurrent-ruby (1.1.8)
31+
diff-lcs (1.4.4)
32+
i18n (1.8.10)
3233
concurrent-ruby (~> 1.0)
33-
minitest (5.13.0)
34-
rake (13.0.1)
35-
rspec (3.9.0)
36-
rspec-core (~> 3.9.0)
37-
rspec-expectations (~> 3.9.0)
38-
rspec-mocks (~> 3.9.0)
39-
rspec-core (3.9.0)
40-
rspec-support (~> 3.9.0)
41-
rspec-expectations (3.9.0)
34+
method_source (1.0.0)
35+
minitest (5.14.4)
36+
pry (0.13.1)
37+
coderay (~> 1.1)
38+
method_source (~> 1.0)
39+
pry-byebug (3.9.0)
40+
byebug (~> 11.0)
41+
pry (~> 0.13.0)
42+
rake (13.0.3)
43+
rspec (3.10.0)
44+
rspec-core (~> 3.10.0)
45+
rspec-expectations (~> 3.10.0)
46+
rspec-mocks (~> 3.10.0)
47+
rspec-core (3.10.1)
48+
rspec-support (~> 3.10.0)
49+
rspec-expectations (3.10.1)
4250
diff-lcs (>= 1.2.0, < 2.0)
43-
rspec-support (~> 3.9.0)
44-
rspec-mocks (3.9.0)
51+
rspec-support (~> 3.10.0)
52+
rspec-mocks (3.10.2)
4553
diff-lcs (>= 1.2.0, < 2.0)
46-
rspec-support (~> 3.9.0)
47-
rspec-support (3.9.0)
54+
rspec-support (~> 3.10.0)
55+
rspec-support (3.10.2)
4856
sqlite3 (1.3.13)
4957
thread_safe (0.3.6)
50-
tzinfo (1.2.5)
58+
tzinfo (1.2.9)
5159
thread_safe (~> 0.1)
5260

5361
PLATFORMS
@@ -56,11 +64,11 @@ PLATFORMS
5664
DEPENDENCIES
5765
activerecord!
5866
bundler
59-
byebug
6067
polymorphic_integer_type!
68+
pry-byebug
6169
rake
6270
rspec
6371
sqlite3 (~> 1.3.6)
6472

6573
BUNDLED WITH
66-
1.16.1
74+
2.1.4

‎gemfiles/Gemfile.rails-5.1-stable.lock‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
GIT
2-
remote: git://github.com/rails/rails.git
2+
remote: https://github.com/rails/rails.git
33
revision: 663206d20aec374a28a24bb43bc7b1233042ed9b
44
branch: 5-1-stable
55
specs:
@@ -18,36 +18,44 @@ GIT
1818
PATH
1919
remote: ..
2020
specs:
21-
polymorphic_integer_type (2.2.4)
22-
activerecord
21+
polymorphic_integer_type (2.3.1)
22+
activerecord (< 6.1)
2323

2424
GEM
2525
remote: https://rubygems.org/
2626
specs:
2727
arel (8.0.0)
28-
byebug (11.0.1)
29-
concurrent-ruby (1.1.5)
30-
diff-lcs (1.3)
31-
i18n (1.7.0)
28+
byebug (11.1.3)
29+
coderay (1.1.3)
30+
concurrent-ruby (1.1.8)
31+
diff-lcs (1.4.4)
32+
i18n (1.8.10)
3233
concurrent-ruby (~> 1.0)
33-
minitest (5.13.0)
34-
rake (13.0.1)
35-
rspec (3.9.0)
36-
rspec-core (~> 3.9.0)
37-
rspec-expectations (~> 3.9.0)
38-
rspec-mocks (~> 3.9.0)
39-
rspec-core (3.9.0)
40-
rspec-support (~> 3.9.0)
41-
rspec-expectations (3.9.0)
34+
method_source (1.0.0)
35+
minitest (5.14.4)
36+
pry (0.13.1)
37+
coderay (~> 1.1)
38+
method_source (~> 1.0)
39+
pry-byebug (3.9.0)
40+
byebug (~> 11.0)
41+
pry (~> 0.13.0)
42+
rake (13.0.3)
43+
rspec (3.10.0)
44+
rspec-core (~> 3.10.0)
45+
rspec-expectations (~> 3.10.0)
46+
rspec-mocks (~> 3.10.0)
47+
rspec-core (3.10.1)
48+
rspec-support (~> 3.10.0)
49+
rspec-expectations (3.10.1)
4250
diff-lcs (>= 1.2.0, < 2.0)
43-
rspec-support (~> 3.9.0)
44-
rspec-mocks (3.9.0)
51+
rspec-support (~> 3.10.0)
52+
rspec-mocks (3.10.2)
4553
diff-lcs (>= 1.2.0, < 2.0)
46-
rspec-support (~> 3.9.0)
47-
rspec-support (3.9.0)
54+
rspec-support (~> 3.10.0)
55+
rspec-support (3.10.2)
4856
sqlite3 (1.4.2)
4957
thread_safe (0.3.6)
50-
tzinfo (1.2.5)
58+
tzinfo (1.2.9)
5159
thread_safe (~> 0.1)
5260

5361
PLATFORMS
@@ -56,11 +64,11 @@ PLATFORMS
5664
DEPENDENCIES
5765
activerecord!
5866
bundler
59-
byebug
6067
polymorphic_integer_type!
68+
pry-byebug
6169
rake
6270
rspec
6371
sqlite3
6472

6573
BUNDLED WITH
66-
1.16.1
74+
2.1.4

‎gemfiles/Gemfile.rails-5.2-stable.lock‎

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
GIT
2-
remote: git://github.com/rails/rails.git
3-
revision: 892eab777c418135ce0646e91bc9ebb08a29ab9b
2+
remote: https://github.com/rails/rails.git
3+
revision: 48661542a2607d55f436438fe21001d262e61fec
44
branch: 5-2-stable
55
specs:
6-
activemodel (5.2.4.1)
7-
activesupport (= 5.2.4.1)
8-
activerecord (5.2.4.1)
9-
activemodel (= 5.2.4.1)
10-
activesupport (= 5.2.4.1)
6+
activemodel (5.2.6)
7+
activesupport (= 5.2.6)
8+
activerecord (5.2.6)
9+
activemodel (= 5.2.6)
10+
activesupport (= 5.2.6)
1111
arel (>= 9.0)
12-
activesupport (5.2.4.1)
12+
activesupport (5.2.6)
1313
concurrent-ruby (~> 1.0, >= 1.0.2)
1414
i18n (>= 0.7, < 2)
1515
minitest (~> 5.1)
@@ -18,36 +18,44 @@ GIT
1818
PATH
1919
remote: ..
2020
specs:
21-
polymorphic_integer_type (2.2.4)
22-
activerecord
21+
polymorphic_integer_type (2.3.1)
22+
activerecord (< 6.1)
2323

2424
GEM
2525
remote: https://rubygems.org/
2626
specs:
2727
arel (9.0.0)
28-
byebug (11.0.1)
29-
concurrent-ruby (1.1.5)
30-
diff-lcs (1.3)
31-
i18n (1.7.0)
28+
byebug (11.1.3)
29+
coderay (1.1.3)
30+
concurrent-ruby (1.1.8)
31+
diff-lcs (1.4.4)
32+
i18n (1.8.10)
3233
concurrent-ruby (~> 1.0)
33-
minitest (5.13.0)
34-
rake (13.0.1)
35-
rspec (3.9.0)
36-
rspec-core (~> 3.9.0)
37-
rspec-expectations (~> 3.9.0)
38-
rspec-mocks (~> 3.9.0)
39-
rspec-core (3.9.0)
40-
rspec-support (~> 3.9.0)
41-
rspec-expectations (3.9.0)
34+
method_source (1.0.0)
35+
minitest (5.14.4)
36+
pry (0.13.1)
37+
coderay (~> 1.1)
38+
method_source (~> 1.0)
39+
pry-byebug (3.9.0)
40+
byebug (~> 11.0)
41+
pry (~> 0.13.0)
42+
rake (13.0.3)
43+
rspec (3.10.0)
44+
rspec-core (~> 3.10.0)
45+
rspec-expectations (~> 3.10.0)
46+
rspec-mocks (~> 3.10.0)
47+
rspec-core (3.10.1)
48+
rspec-support (~> 3.10.0)
49+
rspec-expectations (3.10.1)
4250
diff-lcs (>= 1.2.0, < 2.0)
43-
rspec-support (~> 3.9.0)
44-
rspec-mocks (3.9.0)
51+
rspec-support (~> 3.10.0)
52+
rspec-mocks (3.10.2)
4553
diff-lcs (>= 1.2.0, < 2.0)
46-
rspec-support (~> 3.9.0)
47-
rspec-support (3.9.0)
54+
rspec-support (~> 3.10.0)
55+
rspec-support (3.10.2)
4856
sqlite3 (1.4.2)
4957
thread_safe (0.3.6)
50-
tzinfo (1.2.5)
58+
tzinfo (1.2.9)
5159
thread_safe (~> 0.1)
5260

5361
PLATFORMS
@@ -56,11 +64,11 @@ PLATFORMS
5664
DEPENDENCIES
5765
activerecord!
5866
bundler
59-
byebug
6067
polymorphic_integer_type!
68+
pry-byebug
6169
rake
6270
rspec
6371
sqlite3
6472

6573
BUNDLED WITH
66-
1.16.1
74+
2.1.4

‎gemfiles/Gemfile.rails-6-0-stable‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# frozen_string_literal: true
2+
3+
source "https://rubygems.org"
4+
5+
gemspec path: ".."
6+
7+
gem "activerecord", github: "rails/rails", branch: "6-0-stable"

0 commit comments

Comments
 (0)