Skip to content

Commit 7d9db3d

Browse files
gjtorikiangjtorikian
committed
Merge remote-tracking branch 'upstream/master' into fix-warnings
2 parents 2852874 + 127c395 commit 7d9db3d

File tree

11 files changed

+204
-178
lines changed

11 files changed

+204
-178
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ addons:
66
apt:
77
sources:
88
- libicu-dev
9+
- kalakris-cmake
10+
packages:
11+
- cmake
912

1013
script: bundle exec rake
1114

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ group :test do
1414
gem "rinku", "~> 1.7", :require => false
1515
gem "gemoji", "~> 2.0", :require => false
1616
gem "RedCloth", "~> 4.2.9", :require => false
17-
gem "github-markdown", "~> 0.5", :require => false
17+
gem "commonmarker", "~> 0.14", :require => false
1818
gem "email_reply_parser", "~> 0.5", :require => false
1919
gem "sanitize", "~> 2.0", :require => false
2020

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ gem 'github-linguist'
182182
* `AutolinkFilter` - `rinku`
183183
* `EmailReplyFilter` - `escape_utils`, `email_reply_parser`
184184
* `EmojiFilter` - `gemoji`
185-
* `MarkdownFilter` - `github-markdown`
185+
* `MarkdownFilter` - `commonmarker`
186186
* `PlainTextInputFilter` - `escape_utils`
187187
* `SanitizationFilter` - `sanitize`
188188
* `SyntaxHighlightFilter` - `github-linguist`

‎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 "commonmarker", "~> 0.14", :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: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PATH
2-
remote: ..
2+
remote: ../
33
specs:
44
html-pipeline (2.5.0)
55
activesupport (>= 2)
@@ -36,41 +36,46 @@ GEM
3636
activesupport (3.2.22.2)
3737
i18n (~> 0.6, >= 0.6.4)
3838
multi_json (~> 1.0)
39-
appraisal (2.2.0)
39+
appraisal (2.1.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.9)
46+
commonmarker (0.14.15)
47+
ruby-enum (~> 0.5)
48+
email_reply_parser (0.5.8)
4749
erubis (2.7.0)
4850
escape_utils (1.0.1)
4951
gemoji (2.1.0)
50-
github-linguist (2.12.1)
52+
github-linguist (2.12.0)
5153
charlock_holmes (~> 0.7.3)
5254
escape_utils (~> 1.0.1)
5355
mime-types (~> 1.19)
54-
pygments.rb (> 0.6.0)
55-
github-markdown (0.6.9)
56+
pygments.rb (~> 0.6.0)
5657
hike (1.2.3)
57-
i18n (0.8.1)
58+
i18n (0.7.0)
5859
journey (1.0.4)
59-
json (1.8.6)
60+
json (1.8.3)
6061
mail (2.5.4)
6162
mime-types (~> 1.16)
6263
treetop (~> 1.4.8)
6364
mime-types (1.25.1)
6465
mini_portile2 (2.1.0)
65-
minitest (5.10.2)
66+
minitest (5.9.0)
6667
multi_json (1.12.1)
67-
nokogiri (1.7.2)
68+
nokogiri (1.6.8)
6869
mini_portile2 (~> 2.1.0)
70+
pkg-config (~> 1.1.7)
71+
pkg-config (1.1.7)
6972
polyglot (0.3.5)
70-
pygments.rb (1.1.2)
71-
multi_json (>= 1.0.0)
73+
posix-spawn (0.3.11)
74+
pygments.rb (0.6.3)
75+
posix-spawn (~> 0.3.6)
76+
yajl-ruby (~> 1.2.0)
7277
rack (1.4.7)
73-
rack-cache (1.7.0)
78+
rack-cache (1.6.1)
7479
rack (>= 0.4)
7580
rack-ssl (1.3.4)
7681
rack
@@ -91,23 +96,26 @@ GEM
9196
rake (>= 0.8.7)
9297
rdoc (~> 3.4)
9398
thor (>= 0.14.6, < 2.0)
94-
rake (12.0.0)
99+
rake (11.2.2)
95100
rdoc (3.12.2)
96101
json (~> 1.4)
97102
rinku (1.7.3)
103+
ruby-enum (0.7.1)
104+
i18n
98105
sanitize (2.1.0)
99106
nokogiri (>= 1.4.4)
100107
sprockets (2.2.3)
101108
hike (~> 1.2)
102109
multi_json (~> 1.0)
103110
rack (~> 1.0)
104111
tilt (~> 1.1, != 1.3.0)
105-
thor (0.19.4)
112+
thor (0.19.1)
106113
tilt (1.4.1)
107114
treetop (1.4.15)
108115
polyglot
109116
polyglot (>= 0.3.1)
110-
tzinfo (0.3.53)
117+
tzinfo (0.3.50)
118+
yajl-ruby (1.2.1)
111119

112120
PLATFORMS
113121
ruby
@@ -116,11 +124,11 @@ DEPENDENCIES
116124
RedCloth (~> 4.2.9)
117125
appraisal
118126
bundler
127+
commonmarker (~> 0.14)
119128
email_reply_parser (~> 0.5)
120129
escape_utils (~> 1.0)
121130
gemoji (~> 2.0)
122131
github-linguist (~> 2.10)
123-
github-markdown (~> 0.5)
124132
html-pipeline!
125133
minitest
126134
rack (< 2)
@@ -130,4 +138,4 @@ DEPENDENCIES
130138
sanitize (~> 2.0)
131139

132140
BUNDLED WITH
133-
1.14.3
141+
1.12.5

‎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 "commonmarker", "~> 0.14", :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: 68 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PATH
2-
remote: ..
2+
remote: ../
33
specs:
44
html-pipeline (2.5.0)
55
activesupport (>= 2)
@@ -9,115 +9,124 @@ GEM
99
remote: https://rubygems.org/
1010
specs:
1111
RedCloth (4.2.9)
12-
actionmailer (4.2.8)
13-
actionpack (= 4.2.8)
14-
actionview (= 4.2.8)
15-
activejob (= 4.2.8)
12+
actionmailer (4.2.6)
13+
actionpack (= 4.2.6)
14+
actionview (= 4.2.6)
15+
activejob (= 4.2.6)
1616
mail (~> 2.5, >= 2.5.4)
1717
rails-dom-testing (~> 1.0, >= 1.0.5)
18-
actionpack (4.2.8)
19-
actionview (= 4.2.8)
20-
activesupport (= 4.2.8)
18+
actionpack (4.2.6)
19+
actionview (= 4.2.6)
20+
activesupport (= 4.2.6)
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.8)
26-
activesupport (= 4.2.8)
25+
actionview (4.2.6)
26+
activesupport (= 4.2.6)
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.3)
31-
activejob (4.2.8)
32-
activesupport (= 4.2.8)
30+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31+
activejob (4.2.6)
32+
activesupport (= 4.2.6)
3333
globalid (>= 0.3.0)
34-
activemodel (4.2.8)
35-
activesupport (= 4.2.8)
34+
activemodel (4.2.6)
35+
activesupport (= 4.2.6)
3636
builder (~> 3.1)
37-
activerecord (4.2.8)
38-
activemodel (= 4.2.8)
39-
activesupport (= 4.2.8)
37+
activerecord (4.2.6)
38+
activemodel (= 4.2.6)
39+
activesupport (= 4.2.6)
4040
arel (~> 6.0)
41-
activesupport (4.2.8)
41+
activesupport (4.2.6)
4242
i18n (~> 0.7)
43+
json (~> 1.7, >= 1.7.7)
4344
minitest (~> 5.1)
4445
thread_safe (~> 0.3, >= 0.3.4)
4546
tzinfo (~> 1.1)
46-
appraisal (2.2.0)
47+
appraisal (2.1.0)
4748
bundler
4849
rake
4950
thor (>= 0.14.0)
50-
arel (6.0.4)
51-
builder (3.2.3)
51+
arel (6.0.3)
52+
builder (3.2.2)
5253
charlock_holmes (0.7.3)
53-
concurrent-ruby (1.0.5)
54-
email_reply_parser (0.5.9)
54+
commonmarker (0.14.15)
55+
ruby-enum (~> 0.5)
56+
concurrent-ruby (1.0.2)
57+
email_reply_parser (0.5.8)
5558
erubis (2.7.0)
5659
escape_utils (1.0.1)
5760
gemoji (2.1.0)
58-
github-linguist (2.12.1)
61+
github-linguist (2.12.0)
5962
charlock_holmes (~> 0.7.3)
6063
escape_utils (~> 1.0.1)
6164
mime-types (~> 1.19)
62-
pygments.rb (> 0.6.0)
63-
github-markdown (0.6.9)
64-
globalid (0.4.0)
65-
activesupport (>= 4.2.0)
66-
i18n (0.8.1)
65+
pygments.rb (~> 0.6.0)
66+
globalid (0.3.6)
67+
activesupport (>= 4.1.0)
68+
i18n (0.7.0)
69+
json (1.8.3)
6770
loofah (2.0.3)
6871
nokogiri (>= 1.5.9)
69-
mail (2.6.5)
72+
mail (2.6.4)
7073
mime-types (>= 1.16, < 4)
7174
mime-types (1.25.1)
7275
mini_portile2 (2.1.0)
73-
minitest (5.10.2)
74-
multi_json (1.12.1)
75-
nokogiri (1.7.2)
76+
minitest (5.9.0)
77+
nokogiri (1.6.8)
7678
mini_portile2 (~> 2.1.0)
77-
pygments.rb (1.1.2)
78-
multi_json (>= 1.0.0)
79-
rack (1.6.8)
79+
pkg-config (~> 1.1.7)
80+
pkg-config (1.1.7)
81+
posix-spawn (0.3.11)
82+
pygments.rb (0.6.3)
83+
posix-spawn (~> 0.3.6)
84+
yajl-ruby (~> 1.2.0)
85+
rack (1.6.4)
8086
rack-test (0.6.3)
8187
rack (>= 1.0)
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)
88+
rails (4.2.6)
89+
actionmailer (= 4.2.6)
90+
actionpack (= 4.2.6)
91+
actionview (= 4.2.6)
92+
activejob (= 4.2.6)
93+
activemodel (= 4.2.6)
94+
activerecord (= 4.2.6)
95+
activesupport (= 4.2.6)
9096
bundler (>= 1.3.0, < 2.0)
91-
railties (= 4.2.8)
97+
railties (= 4.2.6)
9298
sprockets-rails
9399
rails-deprecated_sanitizer (1.0.3)
94100
activesupport (>= 4.2.0.alpha)
95-
rails-dom-testing (1.0.8)
101+
rails-dom-testing (1.0.7)
96102
activesupport (>= 4.2.0.beta, < 5.0)
97-
nokogiri (~> 1.6)
103+
nokogiri (~> 1.6.0)
98104
rails-deprecated_sanitizer (>= 1.0.1)
99105
rails-html-sanitizer (1.0.3)
100106
loofah (~> 2.0)
101-
railties (4.2.8)
102-
actionpack (= 4.2.8)
103-
activesupport (= 4.2.8)
107+
railties (4.2.6)
108+
actionpack (= 4.2.6)
109+
activesupport (= 4.2.6)
104110
rake (>= 0.8.7)
105111
thor (>= 0.18.1, < 2.0)
106-
rake (12.0.0)
112+
rake (11.2.2)
107113
rinku (1.7.3)
114+
ruby-enum (0.7.1)
115+
i18n
108116
sanitize (2.1.0)
109117
nokogiri (>= 1.4.4)
110-
sprockets (3.7.1)
118+
sprockets (3.6.2)
111119
concurrent-ruby (~> 1.0)
112120
rack (> 1, < 3)
113-
sprockets-rails (3.2.0)
121+
sprockets-rails (3.1.1)
114122
actionpack (>= 4.0)
115123
activesupport (>= 4.0)
116124
sprockets (>= 3.0.0)
117-
thor (0.19.4)
118-
thread_safe (0.3.6)
119-
tzinfo (1.2.3)
125+
thor (0.19.1)
126+
thread_safe (0.3.5)
127+
tzinfo (1.2.2)
120128
thread_safe (~> 0.1)
129+
yajl-ruby (1.2.1)
121130

122131
PLATFORMS
123132
ruby
@@ -126,11 +135,11 @@ DEPENDENCIES
126135
RedCloth (~> 4.2.9)
127136
appraisal
128137
bundler
138+
commonmarker (~> 0.14)
129139
email_reply_parser (~> 0.5)
130140
escape_utils (~> 1.0)
131141
gemoji (~> 2.0)
132142
github-linguist (~> 2.10)
133-
github-markdown (~> 0.5)
134143
html-pipeline!
135144
minitest
136145
rack (< 2)
@@ -140,4 +149,4 @@ DEPENDENCIES
140149
sanitize (~> 2.0)
141150

142151
BUNDLED WITH
143-
1.14.3
152+
1.12.5

0 commit comments

Comments
 (0)