Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

09bcce7d

Commit 09bcce7d authored 9 years ago by Robert Speicher

Downloads
- Plain Diff

Merge branch 'ldap-attributes' into 'master'

Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261

parents a0aa6453 84d57bc7

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
config/gitlab.yml.example 21 additions, 1 deletion

config/gitlab.yml.example
config/initializers/1_settings.rb 1 addition, 0 deletions

config/initializers/1_settings.rb
doc/integration/ldap.md 20 additions, 0 deletions

doc/integration/ldap.md
lib/gitlab/ldap/auth_hash.rb 35 additions, 0 deletions

lib/gitlab/ldap/auth_hash.rb
lib/gitlab/ldap/config.rb 4 additions, 0 deletions

lib/gitlab/ldap/config.rb
lib/gitlab/ldap/user.rb 4 additions, 0 deletions

lib/gitlab/ldap/user.rb
lib/gitlab/o_auth/auth_hash.rb 11 additions, 11 deletions

lib/gitlab/o_auth/auth_hash.rb
spec/lib/gitlab/ldap/auth_hash_spec.rb 65 additions, 0 deletions

spec/lib/gitlab/ldap/auth_hash_spec.rb
spec/lib/gitlab/ldap/user_spec.rb 1 addition, 1 deletion

spec/lib/gitlab/ldap/user_spec.rb
spec/lib/gitlab/o_auth/auth_hash_spec.rb 3 additions, 3 deletions

spec/lib/gitlab/o_auth/auth_hash_spec.rb
spec/lib/gitlab/o_auth/user_spec.rb 1 addition, 1 deletion

spec/lib/gitlab/o_auth/user_spec.rb

with 167 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment