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

4ab717ea

Unverified Commit 4ab717ea authored 9 years ago by Dmitriy Zaporozhets

Downloads
- Plain Diff

Merge branch 'ldap_migration'


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

Conflicts:
	db/schema.rb

parents ecb58dac f39b150a

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/models/identity.rb 1 addition, 0 deletions

app/models/identity.rb
config/gitlab.yml.example 9 additions, 0 deletions

config/gitlab.yml.example
config/initializers/1_settings.rb 4 additions, 2 deletions

config/initializers/1_settings.rb
db/migrate/20150411000035_fix_identities.rb 32 additions, 0 deletions

db/migrate/20150411000035_fix_identities.rb
db/schema.rb 1 addition, 1 deletion

db/schema.rb
lib/gitlab/ldap/config.rb 0 additions, 2 deletions

lib/gitlab/ldap/config.rb
lib/gitlab/ldap/user.rb 1 addition, 1 deletion

lib/gitlab/ldap/user.rb
spec/lib/gitlab/ldap/config_spec.rb 0 additions, 14 deletions

spec/lib/gitlab/ldap/config_spec.rb

with 48 additions and 20 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