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

c388f3db

Commit c388f3db authored 9 years ago by Douwe Maan

Downloads
- Plain Diff

Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993'

parents a429eb4d 12d8b01e

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/models/user.rb 1 addition, 1 deletion

app/models/user.rb
db/migrate/20150817163600_deduplicate_user_identities.rb 14 additions, 0 deletions

db/migrate/20150817163600_deduplicate_user_identities.rb
lib/gitlab/ldap/user.rb 8 additions, 3 deletions

lib/gitlab/ldap/user.rb
spec/lib/gitlab/ldap/user_spec.rb 22 additions, 0 deletions

spec/lib/gitlab/ldap/user_spec.rb

with 46 additions and 4 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