Commit Graph
39 Commits
Author SHA1 Message Date
Jan-Willem van der Meer e151bbbb28 Extract LDAP config to seperate class 2014-10-07 12:22:16 +02: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 f3346a472e Patch oauth refactoring into EE 2014-09-11 11:53:52 +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 5238efd80c Only return found LDAP groups for processing 2014-08-29 11:09:06 +02:00
Jan-Willem van der Meer 2e21c362db Replace Group id with the answer to the answer to life the universe and everything 2014-08-15 19:50:47 +02:00
Jan-Willem van der Meer 3ba7a3a5ca Remove traces from ldab_cn and ldap_access
Also add notes about refactoring the old single-ldap API and LdapGroupResetService
2014-08-15 12:33:05 +02:00
Jan-Willem van der Meer 5ff230a11d Add more use cases for update_ldap_group_links to unit tests 2014-08-15 12:07:30 +02:00
Jan-Willem van der Meer 2541571014 Add unit test for update_ldap_group_links
This is the first stage, need to add some other to test revoking and
upgrading of the permissions
2014-08-15 11:31:52 +02:00
Jan-Willem van der Meer f6252e8784 Use rspec's 'create anyway' syntax 2014-08-15 10:40:44 +02:00
Jan-Willem van der Meer bb93dfb2c8 Remove old code 2014-08-14 12:54:26 +02:00
Jan-Willem van der Meer 673b9a373b Add method to get the current cns the user has access to 2014-08-13 16:48:36 +02:00
Jan-Willem van der Meer 22b0b2b40e Match rails naming convention
Otherwise IDE won't be able to find the tests
2014-08-13 11:00:19 +02:00
Jacob Vosmaer 526959ab63 Use a scope to add/remove LDAP keys
For some reason I needed to add a reload statement in the specs.
2014-07-09 12:13:09 +02:00
Marvin Frick 423960a435 adds spec for LDAPKeys (+4 squashed commits)
Squashed commits:
[812406c] fixes bug from last refactoring
[53e9508] hides "delete" button if a key is a LDAPKey
[bafc66b] refactores update_ssh_keys in own method
[7895858] makes name of ssh public key configurable
2014-07-08 12:41:12 +02:00
Marvin Frick 4be5c5a7a2 adds feature to sync GitLab admins with LDAP group 2014-06-23 18:17:14 +02:00
Marin Jankovski 7ab468317b Merge branch 'ldap_email_downcase' into 'master'
Fix LDAP email upper case bug
2014-05-22 06:59:13 +00:00
Jacob Vosmaer 4ce8287e02 Add failing spec for upper case LDAP emails 2014-05-21 13:51:58 +02:00
Marin Jankovski 95ef8f9756 Merge remote-tracking branch 'ce/master'
Conflicts:
	VERSION
	doc/install/installation.md
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	lib/gitlab/markdown.rb
	spec/lib/gitlab/ldap/ldap_access_spec.rb
2014-05-21 13:10:37 +02:00
Jacob Vosmaer be1120e968 Improve ad_disabled method name 2014-05-14 19:13:06 +02:00
Jacob Vosmaer d54133b09f Add spec for LDAP::Access#allowed? 2014-05-14 18:26:49 +02:00
Jacob Vosmaer 982d4d51e8 Backport Adapter#dn_matches_filter? from EE 2014-05-14 18:11:14 +02:00
Dmitriy Zaporozhets eff30fff08 Improve dn_matches_filter method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-15 17:27:59 +03:00
Marin Jankovski 0cf7f2f85a Test update_email method. 2014-04-09 12:25:06 +02:00
Jacob Vosmaer 401cac62a4 Add test for LDAP::Adapter#dn_matches_filter? 2014-03-28 14:22:44 +01:00
Dmitriy Zaporozhets 3e864036e7 Fix ldap_user_auth_spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 19:16:43 +02:00
Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
2014-02-11 10:15:13 +02:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 1f43fa20d3 Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/application_controller.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.2-to-6.3.md
2013-12-23 12:57:22 +02:00
skv d89527839e fix most of warnings 2013-12-15 00:05:10 +04:00
Dmitriy Zaporozhets d3844662ec Respect existing group permissions during sync with LDAP group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-14 13:22:51 +02:00
Dmitriy Zaporozhets 81ae87f6a6 Fix tests 2013-10-31 16:12:45 +02:00
Izaak Alpert 75b2ff8f43 Added ldap tests
Change-Id: Ifd77615b3b92d7d8bca92b8875aa8204356cfd85
2013-09-22 20:25:47 -04:00