Dmitriy Zaporozhets
9b140b22fb
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
...
Conflicts:
Gemfile.lock
app/helpers/tab_helper.rb
config/routes.rb
db/schema.rb
2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets
ca701a9649
Improvements to LDAP::User model
...
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
2015-01-29 13:28:41 -08:00
Valery Sizov
2f006f89a5
fix specs after merge CE -> EE
2014-12-08 13:11:33 +02:00
Dmitriy Zaporozhets
3bd66989de
Merge branch 'master' into ee-master
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
Gemfile
Gemfile.lock
VERSION
app/models/project.rb
app/models/user.rb
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.5.md
doc/update/7.4-to-7.5.md
lib/gitlab/git_access.rb
spec/factories.rb
spec/lib/gitlab/git_access_spec.rb
2014-12-05 13:28:32 +02:00
Valery Sizov
f9a730ebb4
fix specs
2014-12-04 15:53:26 +02:00
Valery Sizov
3a5ed5260b
Supporting for multiple omniauth provider for the same user
2014-12-04 13:03:55 +02:00
Valery Sizov
9a3d36505f
Merge branch 'ee_master' into 7-4-stable-ee
...
Conflicts:
VERSION
2014-10-27 13:17:14 +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
7389ab154e
Use server specific admin_group
2014-10-17 17:16:29 +02:00
Jan-Willem van der Meer
02fb3116d5
Add provider to LdapGroupLink tests
2014-10-16 12:28:47 +02:00
Jan-Willem van der Meer
23b692c701
Add specs for authentication and config
2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer
5e1c39cb78
Merge tests to support Multiple LDAP groups
2014-10-13 17:33:44 +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
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
d059f50d4c
Refactor OAuth refactorings to CE
2014-10-10 12:03:32 +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
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
9afa80bbae
Fix EE code after membership refactoring
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-03 14:09:07 +03: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
Marin Jankovski
f7aba277e7
Add option to gitlab config to specify if LDAP server is active directory.
2014-09-30 12:07:31 +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
11bb67c3c6
Test authenticate method for Gitlab::LDAP::User
2014-09-08 14:53:59 +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
92a9964940
Add basic find / create specs for LDAP user
2014-09-01 15:30:46 +02:00
Dmitriy Zaporozhets
14f5199cdc
Merge branch 'feature-ldap-tests' into 'master'
...
Feature ldap tests
Move specs to proper places. Relates to #154
This is already mergeable, will continue in a new branch for additions & refactorings.
See merge request !1053
2014-08-30 07:16:45 +00:00
Jan-Willem van der Meer
0d5ae2802e
Move and rename ldap / oauth specs
2014-08-29 17:30:42 +02:00
Jan-Willem van der Meer
97547428bd
Rename ldap tests even further
2014-08-29 16:04:00 +02:00
Jacob Vosmaer
614ca3ec65
Remove LDAP::Access#find_user
...
This method existed to allow LDAP users to take over existing GitLab
accounts if the part before the '@' of their LDAP email attribute
matched the username of an existing GitLab user. I propose to disable
this behavior in order to prevent unintended GitLab account takeovers.
After this change it is still possible to take over an existing GitLab
account with your LDAP credentials, as long as the GitLab account email
address matches the LDAP user email address.
2014-08-29 15:38:05 +02:00
Jan-Willem van der Meer
6840a276d5
Fix naming convention of LDAP tests
2014-08-29 13:49:01 +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
