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

1ec106b8

Verified Commit 1ec106b8 authored 11 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'ldap_connections'


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG

parents bce8edbb 48e90540

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/controllers/application_controller.rb 11 additions, 9 deletions

app/controllers/application_controller.rb
lib/gitlab/ldap/access.rb 13 additions, 1 deletion

lib/gitlab/ldap/access.rb
lib/gitlab/ldap/adapter.rb 17 additions, 3 deletions

lib/gitlab/ldap/adapter.rb
lib/gitlab/ldap/person.rb 6 additions, 4 deletions

lib/gitlab/ldap/person.rb

with 48 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