home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,856 Commits 48 Branches 340 Tags
757d9aacb5318878e169cbf0ce3bf035ff714b01
Commit Graph
134 Commits
Author SHA1 Message Date
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 74e79105cd Cleanup provider validation 2014-10-10 11:31:33 +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 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 429f9dfac3 Removed duplicated enabled 2014-10-09 10:36:10 +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 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 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 e151bbbb28 Extract LDAP config to seperate class 2014-10-07 12:22:16 +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 9afa80bbae Fix EE code after membership refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-03 14:09:07 +03:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Dmitriy Zaporozhets a5972170ad Merge remote-tracking branch 'origin/master' into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/finders/projects_finder.rb
	app/models/group.rb
	app/models/project_team.rb
	app/models/users_group.rb
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/ldap.md
	features/steps/group.rb
	features/steps/project/project.rb
 2014-10-02 13:24:59 +03:00
Jan-Willem van der Meer ad1c2f79d9 Refactor Gitlab::LDAP::User to instance methods 2014-10-01 14:11:50 +02:00
Jan-Willem van der Meer 37e68cf86b remove stub 2014-09-30 18:21:41 +02:00
Jan-Willem van der Meer 16013bebfe Refactor: Make all Oauth::User methods instance methods 2014-09-30 18:08:05 +02:00
Jan-Willem van der Meer 9edf6f2f9b Add tests for auth hash 2014-09-30 16:29:32 +02:00
Marin Jankovski f7aba277e7 Add option to gitlab config to specify if LDAP server is active directory. 2014-09-30 12:07:31 +02:00
Dmitriy Zaporozhets 15ba6ea105 Refactor Gitlab::GitAccess tests 2014-09-24 12:04:40 +03:00
Dmitriy Zaporozhets 3aa7132adc Add GitAccess specs 2014-09-24 11:37:30 +03:00
Jacob Vosmaer d5c81a8d4a Merge pull request #7692 from mr-vinn/fix-spec-rm 
Use FileUtils to delete instead of File
 2014-09-23 11:23:47 +02:00
Vinnie Okada 8ec602e64f Fix invalid method in test 
Use FileUtils::rm_f to delete the satellite lock file.
 2014-09-22 11:50:27 -05:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Jan-Willem van der Meer f3346a472e Patch oauth refactoring into EE 2014-09-11 11:53:52 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets bde3f25d26 Specs for diff parser! Yay! 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 20:42:12 +03:00
Jan-Willem van der Meer 11bb67c3c6 Test authenticate method for Gitlab::LDAP::User 2014-09-08 14:53:59 +02:00
Jan-Willem van der Meer f27830fa4c Ensure Gitlab::LDAP::authentication is tested 2014-09-08 13:26:25 +02:00
Jan-Willem van der Meer f88b6d0330 Refactor gitlab auth tests 2014-09-08 13:11:39 +02:00
Jan-Willem van der Meer 5b86dab03b Move auth hash to a seperate class 2014-09-04 12:55:10 +02:00
Jan-Willem van der Meer 6c4b51e263 Reset ldab.enabled setting after test 
Should prevent CI failure
 2014-09-04 11:38:43 +02:00
Jan-Willem van der Meer 41f46bfac3 Add basic tests for LDAP::Access.update_permissions 2014-09-03 11:47:48 +02:00
Jan-Willem van der Meer a68b1963a3 Less private methods, more test ordering 2014-09-03 11:28:32 +02:00
Jan-Willem van der Meer 61d0bf0bad Match method order for implementation and class 
This will prevent a mess, and keeps everything clean.
In addition i made the non interface methods private
 2014-09-03 10:38:07 +02:00
Jan-Willem van der Meer 1a59ce4ee7 Add extra tests around OAUTH / LDAP find_or_create 2014-09-03 10:29:03 +02:00
Jan-Willem van der Meer f019821dbf In between patches fixup 2014-09-03 10:18:20 +02:00
Jan-Willem van der Meer 9d3eb09158 Move LDAP tests to proper location 
Same patch as gitlab-ce
https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1053
 2014-09-03 10:10:55 +02:00
Jan-Willem van der Meer c0323b40ee Refactor: beter naming for active directory disabled users 2014-09-01 16:35:18 +02:00
Jan-Willem van der Meer 26b14dd2d5 Get uid from auth instead of info hash 
As found in the omniauth specs: https://github.com/intridea/omniauth/wiki/Auth-Hash-Schema
 2014-09-01 16:31:27 +02:00
Jan-Willem van der Meer 92a9964940 Add basic find / create specs for LDAP user 2014-09-01 15:30:46 +02:00
Jan-Willem van der Meer 262276c5f5 Ensure oath callbacks without a nickname work (google) 2014-09-01 14:26:10 +02:00
Jan-Willem van der Meer 5801d520a7 Handle user creation if email is not provided 
This fixes #1541
 2014-09-01 14:05:01 +02:00
Jan-Willem van der Meer 0ec4abf73c Use local vars for tests 2014-09-01 13:02:41 +02:00
Jan-Willem van der Meer 0c34fa3ea0 Add tests for finding an oauth authenticated user 2014-09-01 12:59:04 +02:00