Commit978e0ef

committed

Merge pull request#632 from github/admin-api-ldap

[Ready for Review] update ldap mapping works with sync disabled

2 parents7c6c7e8 +ba02980 commit978e0efCopy full SHA for 978e0ef

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+require_relative'lib/resources'`
`1`	`2`	`require'nanoc3/tasks'`
`2`	`3`	`require'tmpdir'`
`3`	`4`
`@@ -9,10 +10,16 @@ task :compile do`
`9`	`10`	`end`
`10`	`11`
`11`	`12`	`desc"Test the output"`
`12`		`-task:test=>[:clean,:remove_output_dir,:compile]do`
	`13`	`+task:testdo`
`13`	`14`	`require'html/proofer'`
`14`	`15`	`ignored_links=[%r{www.w3.org}]`
`15`		`-HTML::Proofer.new("./output",:href_ignore=>ignored_links).run`
	`16`	`+latest_ent_version=GitHub::Resources::Helpers::CONTENT['LATEST_ENTERPRISE_VERSION']`
	`17`	`+# swap versionless Enterprise articles with versioned paths`
	`18`	`+href_swap={`
	`19`	`+%r{help\.github\.com/enterprise/admin/}=>"help.github.com/enterprise/#{latest_ent_version}/admin/",`
	`20`	`+%r{help\.github\.com/enterprise/user/}=>"help.github.com/enterprise/#{latest_ent_version}/user/"`
	`21`	`+}`
	`22`	`+HTML::Proofer.new("./output",:href_ignore=>ignored_links,:href_swap=>href_swap).run`
`16`	`23`	`end`
`17`	`24`
`18`	`25`	`desc"Remove the output dir"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ title: LDAP`
`9`	`9`
`10`	`10`	`You can use the LDAP API to update account relationships between a GitHub Enterprise user and its linked LDAP entry or queue a new synchronization.`
`11`	`11`
`12`		`-With the LDAP mapping endpoints, you're able to update the Distinguished Name (DN) that a user maps to. Note that the LDAPsyncendpoints are only effective if your GitHub Enterprise appliance has[LDAP Sync enabled](https://help.github.com/enterprise/2.1/admin/guides/user-management/using-ldap).`
	`12`	`+With the LDAP mapping endpoints, you're able to update the Distinguished Name (DN) that a user maps to. Note thatwiththeexception of[UpdateLDAPmapping for a user](#update-ldap-mapping-for-a-user), the LDAPendpoints are only effective if your GitHub Enterprise appliance has[LDAP Sync enabled](https://help.github.com/enterprise/admin/guides/user-management/using-ldap).[Update LDAP mapping for a user](#update-ldap-mapping-for-a-user) can be used if LDAP is enabled, even if LDAP Sync is disabled.`
`13`	`13`
`14`	`14`	`##Update LDAP mapping for a user`
`15`	`15`

Comments

(0)