Dmitriy Zaporozhets
d01d0c02b7
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
2015-04-15 19:22:57 +03:00
Douwe Maan
238e4f0295
Add config var to block auto-created LDAP users.
2015-04-14 17:09:05 +02:00
Jacob Vosmaer
325b66365b
Remove special cases for the 'ldap' provider
2015-04-13 11:04:31 +02:00
Dmitriy Zaporozhets
633fb8ab6b
Prevent 500 error on ldap group links page
...
If group has links to ldap servers that are disabled or removed from
gitlab config.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-08 15:58:01 +02:00
Valery Sizov
dd559674e2
Merge branch '7-4-stable-ee' into ce_stable
...
Conflicts:
VERSION
lib/gitlab/ldap/adapter.rb
2014-10-24 13:37:25 +03:00
Jacob Vosmaer and Valery Sizov
16a10eb1cd
Fix LDAP config lookup for provider 'ldap'
2014-10-24 12:53:32 +03:00
Jacob Vosmaer
472a6621e9
Fix LDAP config lookup for provider 'ldap'
2014-10-23 22:57:16 +02:00
Jan-Willem van der Meer
9b678226a7
Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync
...
Conflicts:
db/schema.rb
lib/api/ldap.rb
2014-10-15 14:50:24 +02:00
Jan-Willem van der Meer
6ce65a3e95
Use Hash syntax for LDAP server declaration
2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer
01b791237c
Refactor lib files for multiple LDAP groups
2014-10-13 17:24:05 +02:00
Jan-Willem van der Meer
83a3facb17
Add provider to LDAP group links
2014-10-10 16:16:29 +02:00
Jan-Willem van der Meer
74e79105cd
Cleanup provider validation
2014-10-10 11:31:33 +02:00
Jan-Willem van der Meer
824aeacdd7
Only allow valid LDAP::Config instances.
...
When trying to instantiate a new, but unknown provider, guidance is provided to get the correct provider
RuntimeError: Unknown provider (henk). Available providers: ["ldapmain"]
2014-10-10 11:25:35 +02:00
Jan-Willem van der Meer
8271fac0a9
Make AD check for access work properly
2014-10-10 10:46:07 +02:00
Jan-Willem van der Meer
6059e0683a
Make ldap/groups API call backwards compatible
...
It now just returns the results of the first server. A new call will replace
the existing to get results for a specific provider
2014-10-08 16:03:11 +02:00
Jan-Willem van der Meer
f8c8ae29a2
Use LDAP::Config in all of the adapter methods
2014-10-08 15:33:50 +02:00
Jan-Willem van der Meer
212b406f49
Rename ssh_sync_key to old convention to prevent confusion
2014-10-08 15:24:15 +02:00
Jan-Willem van der Meer
e151bbbb28
Extract LDAP config to seperate class
2014-10-07 12:22:16 +02:00
