home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,647 Commits 48 Branches 340 Tags
758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb
Commit Graph
72 Commits
Author SHA1 Message Date
Alex Lossent 7a52573681 Prevent LDAP group sync from removing a group's last owner 2015-06-05 11:06:08 +02:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Douwe Maan 125cb9b866 Don't accidentally unblock auto created users from Active Directory. 2015-05-12 11:26:43 +02:00
Douwe Maan 4210d0f565 Skip email confirmation when updated via LDAP. 2015-04-06 14:18:45 +02:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Douwe Maan 8fed435208 Unblock user if they were unblocked in AD. 2015-03-13 22:34:11 +01:00
Dmitriy Zaporozhets e7f4f0ae1d Block user if he/she was blocked in Active Directory 2015-03-12 11:53:21 -07:00
Marin Jankovski 06590b9195 Be sure that admin_group exists before trying to check for user membership. 2015-03-03 18:41:57 -08:00
Dmitriy Zaporozhets 96a3f0e0a8 Fix rubocop issues 2015-02-04 18:26: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 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Jan-Willem van der Meer b5430b8130 Properly fetch ldap groups 2014-10-15 14:52:07 +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 b01e4a1c90 Move method to match with CE 2014-10-14 17:27:13 +02:00
Jan-Willem van der Meer b229b0f003 Fix authorization for LDAP login 2014-10-14 09:40:35 +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 9b9925bbec Update groups only by own provider 2014-10-10 23:22:27 +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 53816ef8f3 Make AD check server specific 2014-10-10 10:07:37 +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 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 e23a26aea0 Add provider context to Ldap::Access 2014-10-03 17:27:35 +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
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
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 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 c0323b40ee Refactor: beter naming for active directory disabled users 2014-09-01 16:35:18 +02:00
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups 
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
 2014-08-29 14:43:20 +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 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 bb93dfb2c8 Remove old code 2014-08-14 12:54:26 +02:00
Jan-Willem van der Meer bf65eb1d4c Handle multiple LDAP groups 2014-08-14 09:33:40 +02:00
Jan-Willem van der Meer 6f71267e8f Make ldap_user more explicit in param 2014-08-13 16:51:21 +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
Jacob Vosmaer 22ad81e2b3 Fix copy-paste errors in LDAP::Access 2014-08-08 13:04:55 +02:00
Jacob Vosmaer 5629546794 Merge remote-tracking branch 'origin/master' into ldap/cache_check 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
 2014-08-06 18:09:07 +02:00
Jacob Vosmaer 669682686e Move LDAP timeout code to Gitlab::LDAP::Access 2014-08-06 18:03:01 +02:00
Jacob Vosmaer 41a3c84e40 Add logging code for LDAP keys 2014-07-09 12:18:20 +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
Jacob Vosmaer fe6202097a Create an Gitlab::LDAP::Person#ssh_keys attribute 
This allows us to keep Person#entry private, and it makes
Access#update_ssh_keys a little shorter.
 2014-07-09 11:06:53 +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