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

98e1a5b6

Commit 98e1a5b6 authored 9 years ago by Douwe Maan

Downloads
- Patches
- Plain Diff

Allow LDAP users to change their email if it was not set by the LDAP server

parent 425f8d6f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 1 addition, 0 deletions

CHANGELOG
app/models/user.rb 4 additions, 1 deletion

app/models/user.rb
app/views/profiles/show.html.haml 2 additions, 2 deletions

app/views/profiles/show.html.haml
db/migrate/20160119145451_add_ldap_email_to_users.rb 30 additions, 0 deletions

db/migrate/20160119145451_add_ldap_email_to_users.rb
db/schema.rb 2 additions, 1 deletion

db/schema.rb
lib/gitlab/ldap/user.rb 16 additions, 13 deletions

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

lib/gitlab/o_auth/auth_hash.rb
lib/gitlab/o_auth/user.rb 7 additions, 7 deletions

lib/gitlab/o_auth/user.rb
spec/lib/gitlab/ldap/user_spec.rb 27 additions, 1 deletion

spec/lib/gitlab/ldap/user_spec.rb

with 95 additions and 27 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