Skip to content

Commit a108191

Browse files
authored
Merge pull request #311 from zendesk/fvilela/derestrict_nokogiri
Remove version restriction on Nokogiri
2 parents 1ae8876 + df81a42 commit a108191

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/actions.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ jobs:
99
main:
1010
name: ruby
1111
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
ruby-version: [2.6.8, 2.5.9, 2.4.10]
1215
steps:
1316
- uses: zendesk/checkout@v2
1417
- uses: zendesk/setup-ruby@v1
1518
with:
16-
ruby-version: '2.4.0'
19+
ruby-version: ${{ matrix.ruby-version }}
1720
- name: Vendor Cache
1821
id: vendor-cache
1922
uses: zendesk/cache@v2

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PATH
99
json
1010
loofah (~> 2.3.1)
1111
marcel
12-
nokogiri (>= 1.8.5, < 1.11.0)
12+
nokogiri
1313
rb-inotify (= 0.9.10)
1414
sass
1515
sassc

zendesk_apps_support.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
2020
s.add_runtime_dependency 'image_size', '~> 2.0.2'
2121
s.add_runtime_dependency 'erubis'
2222
s.add_runtime_dependency 'loofah', '~> 2.3.1'
23-
s.add_runtime_dependency 'nokogiri', '>= 1.8.5', '< 1.11.0'
23+
s.add_runtime_dependency 'nokogiri'
2424
s.add_runtime_dependency 'rb-inotify', '0.9.10'
2525
s.add_runtime_dependency 'marcel'
2626
s.add_runtime_dependency 'ipaddress_2', '~> 0.13.0'

0 commit comments

Comments
 (0)