Skip to content

Commit 2852874

Browse files
committed
Rebuild all the gem appraisals
These were out of sync and breaking CI
1 parent 0e341b1 commit 2852874

File tree

6 files changed

+163
-176
lines changed

6 files changed

+163
-176
lines changed

gemfiles/rails_3.gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ end
1313

1414
group :test do
1515
gem "minitest"
16-
gem "rinku", "~> 1.7", :require => false
17-
gem "gemoji", "~> 2.0", :require => false
18-
gem "RedCloth", "~> 4.2.9", :require => false
19-
gem "github-markdown", "~> 0.5", :require => false
20-
gem "email_reply_parser", "~> 0.5", :require => false
21-
gem "sanitize", "~> 2.0", :require => false
22-
gem "escape_utils", "~> 1.0", :require => false
23-
gem "github-linguist", "~> 2.10", :require => false
16+
gem "rinku", "~> 1.7", require: false
17+
gem "gemoji", "~> 2.0", require: false
18+
gem "RedCloth", "~> 4.2.9", require: false
19+
gem "github-markdown", "~> 0.5", require: false
20+
gem "email_reply_parser", "~> 0.5", require: false
21+
gem "sanitize", "~> 2.0", require: false
22+
gem "escape_utils", "~> 1.0", require: false
23+
gem "github-linguist", "~> 2.10", require: false
2424
end
2525

26-
gemspec :path => "../"
26+
gemspec path: "../"

gemfiles/rails_3.gemfile.lock

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
2-
remote: ../
2+
remote: ..
33
specs:
4-
html-pipeline (2.4.2)
4+
html-pipeline (2.5.0)
55
activesupport (>= 2)
66
nokogiri (>= 1.4)
77

@@ -36,45 +36,41 @@ GEM
3636
activesupport (3.2.22.2)
3737
i18n (~> 0.6, >= 0.6.4)
3838
multi_json (~> 1.0)
39-
appraisal (2.1.0)
39+
appraisal (2.2.0)
4040
bundler
4141
rake
4242
thor (>= 0.14.0)
4343
arel (3.0.3)
4444
builder (3.0.4)
4545
charlock_holmes (0.7.3)
46-
email_reply_parser (0.5.8)
46+
email_reply_parser (0.5.9)
4747
erubis (2.7.0)
4848
escape_utils (1.0.1)
4949
gemoji (2.1.0)
50-
github-linguist (2.12.0)
50+
github-linguist (2.12.1)
5151
charlock_holmes (~> 0.7.3)
5252
escape_utils (~> 1.0.1)
5353
mime-types (~> 1.19)
54-
pygments.rb (~> 0.6.0)
54+
pygments.rb (> 0.6.0)
5555
github-markdown (0.6.9)
5656
hike (1.2.3)
57-
i18n (0.7.0)
57+
i18n (0.8.1)
5858
journey (1.0.4)
59-
json (1.8.3)
59+
json (1.8.6)
6060
mail (2.5.4)
6161
mime-types (~> 1.16)
6262
treetop (~> 1.4.8)
6363
mime-types (1.25.1)
6464
mini_portile2 (2.1.0)
65-
minitest (5.9.0)
65+
minitest (5.10.2)
6666
multi_json (1.12.1)
67-
nokogiri (1.6.8)
67+
nokogiri (1.7.2)
6868
mini_portile2 (~> 2.1.0)
69-
pkg-config (~> 1.1.7)
70-
pkg-config (1.1.7)
7169
polyglot (0.3.5)
72-
posix-spawn (0.3.11)
73-
pygments.rb (0.6.3)
74-
posix-spawn (~> 0.3.6)
75-
yajl-ruby (~> 1.2.0)
70+
pygments.rb (1.1.2)
71+
multi_json (>= 1.0.0)
7672
rack (1.4.7)
77-
rack-cache (1.6.1)
73+
rack-cache (1.7.0)
7874
rack (>= 0.4)
7975
rack-ssl (1.3.4)
8076
rack
@@ -95,7 +91,7 @@ GEM
9591
rake (>= 0.8.7)
9692
rdoc (~> 3.4)
9793
thor (>= 0.14.6, < 2.0)
98-
rake (11.2.2)
94+
rake (12.0.0)
9995
rdoc (3.12.2)
10096
json (~> 1.4)
10197
rinku (1.7.3)
@@ -106,13 +102,12 @@ GEM
106102
multi_json (~> 1.0)
107103
rack (~> 1.0)
108104
tilt (~> 1.1, != 1.3.0)
109-
thor (0.19.1)
105+
thor (0.19.4)
110106
tilt (1.4.1)
111107
treetop (1.4.15)
112108
polyglot
113109
polyglot (>= 0.3.1)
114-
tzinfo (0.3.50)
115-
yajl-ruby (1.2.1)
110+
tzinfo (0.3.53)
116111

117112
PLATFORMS
118113
ruby
@@ -135,4 +130,4 @@ DEPENDENCIES
135130
sanitize (~> 2.0)
136131

137132
BUNDLED WITH
138-
1.12.5
133+
1.14.3

gemfiles/rails_4.gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ end
1313

1414
group :test do
1515
gem "minitest"
16-
gem "rinku", "~> 1.7", :require => false
17-
gem "gemoji", "~> 2.0", :require => false
18-
gem "RedCloth", "~> 4.2.9", :require => false
19-
gem "github-markdown", "~> 0.5", :require => false
20-
gem "email_reply_parser", "~> 0.5", :require => false
21-
gem "sanitize", "~> 2.0", :require => false
22-
gem "escape_utils", "~> 1.0", :require => false
23-
gem "github-linguist", "~> 2.10", :require => false
16+
gem "rinku", "~> 1.7", require: false
17+
gem "gemoji", "~> 2.0", require: false
18+
gem "RedCloth", "~> 4.2.9", require: false
19+
gem "github-markdown", "~> 0.5", require: false
20+
gem "email_reply_parser", "~> 0.5", require: false
21+
gem "sanitize", "~> 2.0", require: false
22+
gem "escape_utils", "~> 1.0", require: false
23+
gem "github-linguist", "~> 2.10", require: false
2424
end
2525

26-
gemspec :path => "../"
26+
gemspec path: "../"

gemfiles/rails_4.gemfile.lock

Lines changed: 58 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,123 @@
11
PATH
2-
remote: ../
2+
remote: ..
33
specs:
4-
html-pipeline (2.4.2)
4+
html-pipeline (2.5.0)
55
activesupport (>= 2)
66
nokogiri (>= 1.4)
77

88
GEM
99
remote: https://rubygems.org/
1010
specs:
1111
RedCloth (4.2.9)
12-
actionmailer (4.2.6)
13-
actionpack (= 4.2.6)
14-
actionview (= 4.2.6)
15-
activejob (= 4.2.6)
12+
actionmailer (4.2.8)
13+
actionpack (= 4.2.8)
14+
actionview (= 4.2.8)
15+
activejob (= 4.2.8)
1616
mail (~> 2.5, >= 2.5.4)
1717
rails-dom-testing (~> 1.0, >= 1.0.5)
18-
actionpack (4.2.6)
19-
actionview (= 4.2.6)
20-
activesupport (= 4.2.6)
18+
actionpack (4.2.8)
19+
actionview (= 4.2.8)
20+
activesupport (= 4.2.8)
2121
rack (~> 1.6)
2222
rack-test (~> 0.6.2)
2323
rails-dom-testing (~> 1.0, >= 1.0.5)
2424
rails-html-sanitizer (~> 1.0, >= 1.0.2)
25-
actionview (4.2.6)
26-
activesupport (= 4.2.6)
25+
actionview (4.2.8)
26+
activesupport (= 4.2.8)
2727
builder (~> 3.1)
2828
erubis (~> 2.7.0)
2929
rails-dom-testing (~> 1.0, >= 1.0.5)
30-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31-
activejob (4.2.6)
32-
activesupport (= 4.2.6)
30+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
31+
activejob (4.2.8)
32+
activesupport (= 4.2.8)
3333
globalid (>= 0.3.0)
34-
activemodel (4.2.6)
35-
activesupport (= 4.2.6)
34+
activemodel (4.2.8)
35+
activesupport (= 4.2.8)
3636
builder (~> 3.1)
37-
activerecord (4.2.6)
38-
activemodel (= 4.2.6)
39-
activesupport (= 4.2.6)
37+
activerecord (4.2.8)
38+
activemodel (= 4.2.8)
39+
activesupport (= 4.2.8)
4040
arel (~> 6.0)
41-
activesupport (4.2.6)
41+
activesupport (4.2.8)
4242
i18n (~> 0.7)
43-
json (~> 1.7, >= 1.7.7)
4443
minitest (~> 5.1)
4544
thread_safe (~> 0.3, >= 0.3.4)
4645
tzinfo (~> 1.1)
47-
appraisal (2.1.0)
46+
appraisal (2.2.0)
4847
bundler
4948
rake
5049
thor (>= 0.14.0)
51-
arel (6.0.3)
52-
builder (3.2.2)
50+
arel (6.0.4)
51+
builder (3.2.3)
5352
charlock_holmes (0.7.3)
54-
concurrent-ruby (1.0.2)
55-
email_reply_parser (0.5.8)
53+
concurrent-ruby (1.0.5)
54+
email_reply_parser (0.5.9)
5655
erubis (2.7.0)
5756
escape_utils (1.0.1)
5857
gemoji (2.1.0)
59-
github-linguist (2.12.0)
58+
github-linguist (2.12.1)
6059
charlock_holmes (~> 0.7.3)
6160
escape_utils (~> 1.0.1)
6261
mime-types (~> 1.19)
63-
pygments.rb (~> 0.6.0)
62+
pygments.rb (> 0.6.0)
6463
github-markdown (0.6.9)
65-
globalid (0.3.6)
66-
activesupport (>= 4.1.0)
67-
i18n (0.7.0)
68-
json (1.8.3)
64+
globalid (0.4.0)
65+
activesupport (>= 4.2.0)
66+
i18n (0.8.1)
6967
loofah (2.0.3)
7068
nokogiri (>= 1.5.9)
71-
mail (2.6.4)
69+
mail (2.6.5)
7270
mime-types (>= 1.16, < 4)
7371
mime-types (1.25.1)
7472
mini_portile2 (2.1.0)
75-
minitest (5.9.0)
76-
nokogiri (1.6.8)
73+
minitest (5.10.2)
74+
multi_json (1.12.1)
75+
nokogiri (1.7.2)
7776
mini_portile2 (~> 2.1.0)
78-
pkg-config (~> 1.1.7)
79-
pkg-config (1.1.7)
80-
posix-spawn (0.3.11)
81-
pygments.rb (0.6.3)
82-
posix-spawn (~> 0.3.6)
83-
yajl-ruby (~> 1.2.0)
84-
rack (1.6.4)
77+
pygments.rb (1.1.2)
78+
multi_json (>= 1.0.0)
79+
rack (1.6.8)
8580
rack-test (0.6.3)
8681
rack (>= 1.0)
87-
rails (4.2.6)
88-
actionmailer (= 4.2.6)
89-
actionpack (= 4.2.6)
90-
actionview (= 4.2.6)
91-
activejob (= 4.2.6)
92-
activemodel (= 4.2.6)
93-
activerecord (= 4.2.6)
94-
activesupport (= 4.2.6)
82+
rails (4.2.8)
83+
actionmailer (= 4.2.8)
84+
actionpack (= 4.2.8)
85+
actionview (= 4.2.8)
86+
activejob (= 4.2.8)
87+
activemodel (= 4.2.8)
88+
activerecord (= 4.2.8)
89+
activesupport (= 4.2.8)
9590
bundler (>= 1.3.0, < 2.0)
96-
railties (= 4.2.6)
91+
railties (= 4.2.8)
9792
sprockets-rails
9893
rails-deprecated_sanitizer (1.0.3)
9994
activesupport (>= 4.2.0.alpha)
100-
rails-dom-testing (1.0.7)
95+
rails-dom-testing (1.0.8)
10196
activesupport (>= 4.2.0.beta, < 5.0)
102-
nokogiri (~> 1.6.0)
97+
nokogiri (~> 1.6)
10398
rails-deprecated_sanitizer (>= 1.0.1)
10499
rails-html-sanitizer (1.0.3)
105100
loofah (~> 2.0)
106-
railties (4.2.6)
107-
actionpack (= 4.2.6)
108-
activesupport (= 4.2.6)
101+
railties (4.2.8)
102+
actionpack (= 4.2.8)
103+
activesupport (= 4.2.8)
109104
rake (>= 0.8.7)
110105
thor (>= 0.18.1, < 2.0)
111-
rake (11.2.2)
106+
rake (12.0.0)
112107
rinku (1.7.3)
113108
sanitize (2.1.0)
114109
nokogiri (>= 1.4.4)
115-
sprockets (3.6.2)
110+
sprockets (3.7.1)
116111
concurrent-ruby (~> 1.0)
117112
rack (> 1, < 3)
118-
sprockets-rails (3.1.1)
113+
sprockets-rails (3.2.0)
119114
actionpack (>= 4.0)
120115
activesupport (>= 4.0)
121116
sprockets (>= 3.0.0)
122-
thor (0.19.1)
123-
thread_safe (0.3.5)
124-
tzinfo (1.2.2)
117+
thor (0.19.4)
118+
thread_safe (0.3.6)
119+
tzinfo (1.2.3)
125120
thread_safe (~> 0.1)
126-
yajl-ruby (1.2.1)
127121

128122
PLATFORMS
129123
ruby
@@ -146,4 +140,4 @@ DEPENDENCIES
146140
sanitize (~> 2.0)
147141

148142
BUNDLED WITH
149-
1.12.5
143+
1.14.3

gemfiles/rails_5.gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ end
1212

1313
group :test do
1414
gem "minitest"
15-
gem "rinku", "~> 1.7", :require => false
16-
gem "gemoji", "~> 2.0", :require => false
17-
gem "RedCloth", "~> 4.2.9", :require => false
18-
gem "github-markdown", "~> 0.5", :require => false
19-
gem "email_reply_parser", "~> 0.5", :require => false
20-
gem "sanitize", "~> 2.0", :require => false
21-
gem "escape_utils", "~> 1.0", :require => false
22-
gem "github-linguist", "~> 2.10", :require => false
15+
gem "rinku", "~> 1.7", require: false
16+
gem "gemoji", "~> 2.0", require: false
17+
gem "RedCloth", "~> 4.2.9", require: false
18+
gem "github-markdown", "~> 0.5", require: false
19+
gem "email_reply_parser", "~> 0.5", require: false
20+
gem "sanitize", "~> 2.0", require: false
21+
gem "escape_utils", "~> 1.0", require: false
22+
gem "github-linguist", "~> 2.10", require: false
2323
end
2424

25-
gemspec :path => "../"
25+
gemspec path: "../"

0 commit comments

Comments
 (0)