Commit30ec6f7

committed

Revert "Sync changes from upstream repository"

This reverts commitc0f8242.

1 parent26e8ca5 commit30ec6f7Copy full SHA for 30ec6f7

File tree

-15

lines changed

-15

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`	`!/assets/vendor/lunr.js/lunr.js`
`13`	`13`	`!/assets/vendor/lunr.js/lunr.min.js`
`14`	`14`
`15`		`-_site/`
`16`		`-enterprise/`
`17`	`15`	`output`
`18`	`16`	`tmp`
`19`	`17`	`.DS_Store`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,6 @@ task :build do`
`20`	`20`	`end`
`21`	`21`	`end`
`22`	`22`
`23`		`-task:build_latest_entdo`
`24`		`-putssh"script/enterprise-backport#{config[:versions].first} --keep"`
`25`		`-end`
`26`		`-`
`27`	`23`	`desc"Test the output"`
`28`	`24`	`task:test=>[:remove_tmp_dir,:remove_output_dir,:build]do`
`29`	`25`	`Rake::Task['spec'].invoke`
`@@ -84,9 +80,6 @@ end`
`84`	`80`	`namespace:assetsdo`
`85`	`81`	`task:precompile=>[:build]do`
`86`	`82`	`sh'mv output _site/'`
`87`		`-Rake::Task['build_latest_ent'].invoke`
`88`		`-sh"mkdir -p _site/enterprise/#{config[:versions].first}"`
`89`		`-sh"mv output/* _site/enterprise/#{config[:versions].first}"`
`90`	`83`	`end`
`91`	`84`	`end`
`92`	`85`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ data_variables:`
`52`	`52`	`Nanoc::Int::SiteLoader.new.new_with_config(versioned_config).compile`
`53`	`53`
`54`	`54`	puts`node_modules/gulp/bin/gulp.js assets`
`55`		`-raiseunless $CHILD_STATUS.to_i ==0`
	`55`	`+failunless $CHILD_STATUS.to_i ==0`
`56`	`56`
`57`	`57`	`versioned_config`
`58`	`58`	`end`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-require'yaml'`
`2`	`1`	`require'json'`
`3`	`2`	`require'active_support/core_ext/hash'`
`4`	`3`
`@@ -9,3 +8,4 @@ end`
`9`	`8`	`defsymbolize_hash(hash)`
`10`	`9`	`hash.deep_symbolize_keys`
`11`	`10`	`end`
	`11`	`+`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,3 @@ def cleanup`
`131`	`131`	`FileUtils.rm_rf"#{VERSIONED_ENT_PATH}/assets/vendor"`
`132`	`132`	`FileUtils.rm_rf"#{VERSIONED_ENT_PATH}/assets/images"`
`133`	`133`	`end`
`134`		`-`
`135`		`-defkeep?`
`136`		`-ARGV.include?('--keep')`
`137`		`-end`

Comments

(0)