Commitd2070cf

committed

pulled master and resolved conflicts

2 parents81e585f +da853d8 commitd2070cfCopy full SHA for d2070cf

File tree

-7

lines changed

-7

lines changed

8.35 KB

Binary file not shown.

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,12 @@ If you missed any of our previous online announcements, you can find the latest`
`9`	`9`
`10`	`10`	`>To subscribe to an RSS / Atom feed for our SaaS release notes, please[click here]({{ site.baseurl }}/changelog/gitops.xml).`
`11`	`11`
`12`		`-{% assign posts_by_year = site.posts-gitops \| group_by_exp: "post", "post.date \| date: '%Y'" %}`
	`12`	`+{% assign posts_by_year = site.posts-gitops \| group_by_exp: "post", "post.date \| date: '%Y'"\| reverse%}`
`13`	`13`	`{% for year in posts_by_year %}`
`14`	`14`	`<h2>{{ year.name }}</h2>`
`15`	`15`	`<ul>`
`16`		`-{% for post in year.items %}`
	`16`	`+{% assign sorted_posts = year.items \| reverse %}`
	`17`	`+{% for post in sorted_posts %}`
`17`	`18`	`<li>`
`18`	`19`	`<a href="{{ site.baseurl }}{{ post.url }}">{{ post.title }}</a>`
`19`	`20`	`</li>`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,9 +112,7 @@ async function selectSegmentOption(option, selectedValue) {`
`112`	`112`	`if(selectedValue==='enterprise'){`
`113`	`113`	`removeGitOpsDocumentationCookie()`
`114`	`114`
`115`		`-constenterprisePath=Object.keys(redirectMap).find(`
`116`		`-(key)=>redirectMap[key]===currentPath`
`117`		`-)`
	`115`	`+constenterprisePath=Object.keys(redirectMap).find(key=>redirectMap[key]===currentPath)`
`118`	`116`
`119`	`117`	`if(enterprisePath){`
`120`	`118`	window.location.href=`${SITE_BASE_URL}${enterprisePath}`
`@@ -167,7 +165,7 @@ function handleOptionKeydown(event, option, selectedValue) {`
`167`	`165`	`}`
`168`	`166`	`}`
`169`	`167`
`170`		`-document.addEventListener('click',(e)=>{`
	`168`	`+document.addEventListener('click',e=>{`
`171`	`169`	`constselect=document.querySelector('.custom-select')`
`172`	`170`	`if(!select.contains(e.target)){`
`173`	`171`	`select.classList.remove('open')`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"js-lint-docs":"eslint assets/js/",`
`22`	`22`	`"js-minify":"npm-run-all --parallel js-minify-*",`
`23`	`23`	`"js-minify-docs":"uglifyjs --mangle --comments\"/^!/\" --output assets/js/docs.min.js assets/js/vendor/anchor.min.js assets/js/vendor/clipboard.min.js assets/js/vendor/holder.min.js assets/js/vendor/jquery.smooth-scroll.min.js assets/js/vendor/jquery.cookie.min.js assets/js/vendor/jquery.navgoco.js\"assets/js/src/*.js\"",`
`24`		`-"js-minify-argohub":"uglifyjs assets/js/argohub-redirect/argohub-redirect.js --output assets/js/argohub-redirect/argohub-redirect.min.js --comments\\\\\\\"/^!/\\\\\\\"",`
	`24`	`+"js-minify-argohub":"uglifyjs assets/js/argohub-redirect/argohub-redirect.js --output assets/js/argohub-redirect/argohub-redirect.min.js",`
`25`	`25`	`"docs":"npm-run-all --parallel css-docs js-docs --sequential docs-compile docs-lint",`
`26`	`26`	`"docs-compile":"set JEKYLL_ENV=production && bundle exec jekyll build",`
`27`	`27`	`"postdocs-compile":"npm run docs-workbox-precache",`

Comments

(0)