home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,856 Commits 48 Branches 340 Tags
757d9aacb5318878e169cbf0ce3bf035ff714b01
Commit Graph
12856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jan-Willem van der Meer 757d9aacb5 Call the correct authentication method 2014-10-10 15:02:31 +02:00
Jan-Willem van der Meer 89ac11df5c Merge branch 'feature-multi-ldap-servers' into feature-multiple-ldap-push-authentication 2014-10-10 12:22:46 +02:00
Jan-Willem van der Meer f06a60e2ad Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers 2014-10-10 12:05:11 +02:00
Jan-Willem van der Meer 70efa16a0c More specific check for generated email 2014-10-10 12:00:37 +02:00
Jan-Willem van der Meer 9a1573b2dc More usefull errors if saving fails 2014-10-10 11:56:20 +02:00
Jan-Willem van der Meer 492398a6c6 Clearly distance ourselfs from AR methods 2014-10-10 11:44:04 +02:00
Jan-Willem van der Meer 049ae5b331 Clearly distance ourselfs from AR methods 2014-10-10 11:42:49 +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 faf54d525c Name the default provider main, to avoid name collisions 2014-10-10 10:57:09 +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 adee309127 Better description for new LDAP options 2014-10-10 10:10:39 +02:00
Jan-Willem van der Meer 53816ef8f3 Make AD check server specific 2014-10-10 10:07:37 +02:00
Jan-Willem van der Meer 1835fceb4b Make allow_username_or_email_login server specific 2014-10-10 09:40:31 +02:00
Jan-Willem van der Meer c832c50c87 Do not use primary flag for LDAP servers 2014-10-10 09:36:54 +02:00
Jan-Willem van der Meer 5b38186867 Add note for refactoring 2014-10-10 09:12:16 +02:00
Jan-Willem van der Meer 19d811e6bf Make LDAP authentication work with multiple LDAP servers 2014-10-09 19:09:36 +02:00
Jan-Willem van der Meer 6373c84d5f Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers 
Conflicts:
	app/models/user.rb
	config/gitlab.yml.example
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-09 12:26:19 +02:00
Jan-Willem van der Meer d6cabd2732 Add explanation about new gitlab.yml attributes 2014-10-09 12:13:28 +02:00
Jan-Willem van der Meer 429f9dfac3 Removed duplicated enabled 2014-10-09 10:36:10 +02:00
Jan-Willem van der Meer 797ac2d60f Make authentication backwards compatible with multiple LDAP servers 
Note: authentication agains an other server, other then the first
still does not work. This will be completed in further MR's
 2014-10-09 08:54:55 +02:00
Jan-Willem van der Meer ddb46f48f3 Explain auth logic some more 2014-10-08 16:09:29 +02:00
Jan-Willem van der Meer c0229e46a3 Adapt ldap_user? to multiple ldap providers 2014-10-08 16:07:49 +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 f488fd598e Add hint for refactoring 2014-10-08 13:56:13 +02:00
Jan-Willem van der Meer ee0154cd0c Add proper ssh sync attribute key for tests 2014-10-07 17:39:53 +02:00
Jan-Willem van der Meer e972ac691b Remove binding.pry 2014-10-07 17:27:56 +02:00
Jan-Willem van der Meer 1bc99369dc Adapt tests to refactoring 
- Use smarter instance methods
- Support multiple LDAP servers
 2014-10-07 17:25:13 +02:00
Jan-Willem van der Meer 4ef74844c3 Adapt to new LDAP::Config class 2014-10-07 12:31:30 +02:00
Jan-Willem van der Meer e60da677f2 Add example LDAP config for tests 2014-10-07 12:28:02 +02:00
Jan-Willem van der Meer e151bbbb28 Extract LDAP config to seperate class 2014-10-07 12:22:16 +02:00
Dmitriy Zaporozhets 37169e5408 Merge branch 'ee-7-4' into 'master' 
More new code from CE 7.4 into EE

See merge request !191
 2014-10-03 20:50:50 +00:00
Jan-Willem van der Meer e23a26aea0 Add provider context to Ldap::Access 2014-10-03 17:27:35 +02:00
Jan-Willem van der Meer 0e276f9cbf Move allowed call to LDAP::User 2014-10-03 17:27:14 +02:00
Jan-Willem van der Meer ce22ffbc7f Reuse the ldap adapter 2014-10-03 17:21:38 +02:00
Jan-Willem van der Meer e08c14c0f0 Use provider based ldap config 2014-10-03 17:18:25 +02:00
Jan-Willem van der Meer 63132b7513 Enable provider based LDAP adapter 2014-10-03 17:16:12 +02:00
Dmitriy Zaporozhets 7cf86dc472 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into ee-7-4 2014-10-03 18:13:24 +03:00
Dmitriy Zaporozhets 74ac2df364 Merge branch 'fix_for_project_without_group' into 'master' 
Fix for project without group

See merge request !192
 2014-10-03 15:11:50 +00:00
Marin Jankovski 94ba1f0108 If project doesn't have a group, group ldap sync is false. 2014-10-03 16:43:19 +02:00
Marin Jankovski d3bf5f63f4 Updated packages for 7.2.0 and 7.2.1 for ubuntu and debian. 2014-10-03 15:43:33 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Dmitriy Zaporozhets 778923b66c Merge branch 'ee-7-4' into 'master' 
Recent 7.4 code from CE into EE

Fixes #187

See merge request !190
 2014-10-03 12:29:35 +00:00
Jan-Willem van der Meer a6422e271e Add TODO for further refactoring 2014-10-03 14:01:06 +02:00
Jan-Willem van der Meer d9355ea590 Allow proper provider_name for ldap provider 2014-10-03 14:00:28 +02:00
Dmitriy Zaporozhets da38e4f5db Merge branch 'do_not_show_ldap_users_in_dropdowns' into 'master' 
Do not show ldap users in dropdowns

Fixes #160

See merge request !186
 2014-10-03 11:40:35 +00:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
 2014-10-03 14:38:33 +03:00
Dmitriy Zaporozhets 8188427e83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-03 14:12:40 +03:00