Skip to content

Commit 2fc3773

Browse files
committed
Merge branch 'master' into develop
2 parents c1d4192 + 08c601d commit 2fc3773

File tree

3 files changed

+43
-5
lines changed

3 files changed

+43
-5
lines changed

docs/Gemfile.lock

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.6)
4+
activesupport (7.0.7.2)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
@@ -13,7 +13,7 @@ GEM
1313
execjs
1414
coffee-script-source (1.11.1)
1515
colorator (1.1.0)
16-
commonmarker (0.23.9)
16+
commonmarker (0.23.10)
1717
concurrent-ruby (1.2.2)
1818
dnsruby (1.70.0)
1919
simpleidn (~> 0.2.1)
@@ -210,19 +210,22 @@ GEM
210210
jekyll-feed (~> 0.9)
211211
jekyll-seo-tag (~> 2.1)
212212
minitest (5.19.0)
213-
nokogiri (1.15.3-arm64-darwin)
213+
nokogiri (1.16.5-arm64-darwin)
214+
racc (~> 1.4)
215+
nokogiri (1.16.5-x86_64-linux)
214216
racc (~> 1.4)
215217
octokit (4.25.1)
216218
faraday (>= 1, < 3)
217219
sawyer (~> 0.9)
218220
pathutil (0.16.2)
219221
forwardable-extended (~> 2.6)
220222
public_suffix (4.0.7)
221-
racc (1.7.1)
223+
racc (1.7.3)
222224
rb-fsevent (0.11.2)
223225
rb-inotify (0.10.1)
224226
ffi (~> 1.0)
225-
rexml (3.2.6)
227+
rexml (3.3.6)
228+
strscan
226229
rouge (3.26.0)
227230
ruby2_keywords (0.0.5)
228231
rubyzip (2.3.2)
@@ -237,6 +240,7 @@ GEM
237240
faraday (>= 0.17.3, < 3)
238241
simpleidn (0.2.1)
239242
unf (~> 0.1.4)
243+
strscan (3.1.0)
240244
terminal-table (1.8.0)
241245
unicode-display_width (~> 1.1, >= 1.1.1)
242246
typhoeus (1.4.0)
@@ -252,6 +256,7 @@ GEM
252256
PLATFORMS
253257
arm64-darwin-21
254258
arm64-darwin-23
259+
x86_64-linux
255260

256261
DEPENDENCIES
257262
github-pages (~> 228)

docs/_config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ plugins:
55

66
heading_anchors: true
77

8+
logo: "/assets/ProgressMarkLogic_PrimaryLogo_Stacked.svg"
9+
810
# Aux links for the upper right navigation
911
aux_links:
1012
"marklogic-community/marklogic-unit-test":
Lines changed: 31 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)