Skip to content

Commit 616fbbe

Browse files
zkoppertCopilot
andcommitted
fix: resolve merge conflicts with master
Keep nokogiri >= 1.19.1 from master (newer than PR's ~> 1.18.10). Preserve PR's other dependency bumps (asciidoctor, rake, rexml, github-linguist, cgi). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents 789f2ed + e9d0940 commit 616fbbe

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
strategy:
1515
matrix:
1616
ruby:
17-
- "3.1"
1817
- "3.2"
1918
- "3.3"
2019
- "3.4"

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ gem "twitter-text", "~> 1.14"
1515
gem "asciidoctor", "~> 2.0.26"
1616
gem "rake"
1717
gem "rexml"
18-
gem "nokogiri", "~> 1.18.10"
18+
gem "nokogiri", ">= 1.19.1"

Gemfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ GEM
5858
mini_portile2 (2.8.9)
5959
minitest (5.25.5)
6060
mutex_m (0.3.0)
61-
nokogiri (1.18.10)
61+
nokogiri (1.19.1)
6262
mini_portile2 (~> 2.8.2)
6363
racc (~> 1.4)
64-
nokogiri (1.18.10-aarch64-linux-gnu)
64+
nokogiri (1.19.1-aarch64-linux-gnu)
6565
racc (~> 1.4)
66-
nokogiri (1.18.10-arm-linux-gnu)
66+
nokogiri (1.19.1-arm-linux-gnu)
6767
racc (~> 1.4)
68-
nokogiri (1.18.10-arm64-darwin)
68+
nokogiri (1.19.1-arm64-darwin)
6969
racc (~> 1.4)
70-
nokogiri (1.18.10-x86_64-darwin)
70+
nokogiri (1.19.1-x86_64-darwin)
7171
racc (~> 1.4)
72-
nokogiri (1.18.10-x86_64-linux-gnu)
72+
nokogiri (1.19.1-x86_64-linux-gnu)
7373
racc (~> 1.4)
7474
nokogiri-diff (0.3.0)
7575
nokogiri (~> 1.5)
@@ -128,7 +128,7 @@ DEPENDENCIES
128128
html-pipeline (~> 1.0)
129129
kramdown
130130
minitest (~> 5.4, >= 5.4.3)
131-
nokogiri (~> 1.18.10)
131+
nokogiri (>= 1.19.1)
132132
nokogiri-diff (~> 0.3.0)
133133
org-ruby (= 0.9.12)
134134
rake
@@ -140,4 +140,4 @@ DEPENDENCIES
140140
wikicloth (= 0.8.3)
141141

142142
BUNDLED WITH
143-
2.5.9
143+
2.4.10

0 commit comments

Comments
 (0)