home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,060 Commits 48 Branches 340 Tags
f4c64d44c22eaea75eddbcde6b3dcdfdef0bf94d
Commit Graph
746 Commits
Author SHA1 Message Date
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 471054e1f5 Merge branch 'ce-upstream' into feature-multi-ldap-servers-merge-master 
Conflicts:
	app/controllers/sessions_controller.rb
	app/models/user.rb
	app/views/devise/sessions/new.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
	config/initializers/devise.rb
	lib/api/ldap.rb
	lib/gitlab/ldap/authentication.rb
	lib/gitlab/ldap/config.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/ldap/user.rb
 2014-10-15 08:19:13 +02:00
Jan-Willem van der Meer d9a8789166 Fix JIRA issue parsing 2014-10-15 07:49:35 +02:00
Jan-Willem van der Meer c1865b69cd Fix merge conflicts 
Due to the complicated merge, part of the new functionalilty is inserted here
 2014-10-14 23:41:07 +02:00
Jan-Willem van der Meer 4ace6dbf6c Fix merge conflicts 2014-10-14 17:31:28 +02:00
Jan-Willem van der Meer b01e4a1c90 Move method to match with CE 2014-10-14 17:27:13 +02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-10-14 18:23:51 +03:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Jan-Willem van der Meer 9bf7bfda20 Remove unused methods 2014-10-14 12:09:24 +02:00
Jan-Willem van der Meer ab04096c6c Add explaining note to authentication method [skip ci] 2014-10-14 11:16:47 +02:00
Jan-Willem van der Meer 18d2ee31e8 Use server specific uid 2014-10-14 10:54:43 +02:00
Jan-Willem van der Meer d3056feb11 Make sure the filters are applied 2014-10-14 10:08:47 +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 93505f7d04 DRY find method to find Gitlab user 2014-10-14 09:05:29 +02:00
Jan-Willem van der Meer 410d6e306b Remove unused method 2014-10-14 08:54:15 +02:00
Marin Jankovski 51f9f4807b Remove unecessary nesting. 2014-10-14 08:24:48 +02:00
Jan-Willem van der Meer 01b791237c Refactor lib files for multiple LDAP groups 2014-10-13 17:24:05 +02:00
Dmitriy Zaporozhets 9229893c8a Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

same MR as gitlab/gitlab-ee!188

See merge request !1169
 2014-10-13 11:46:45 +00:00
Jan-Willem van der Meer 9b9925bbec Update groups only by own provider 2014-10-10 23:22:27 +02:00
Marin Jankovski 2ea166fc33 Make sure relative url and asset_host are honored, specs. 2014-10-10 17:31:47 +02:00
Jan-Willem van der Meer 83a3facb17 Add provider to LDAP group links 2014-10-10 16:16:29 +02:00
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 d059f50d4c Refactor OAuth refactorings to CE 2014-10-10 12:03:32 +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 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
Marin Jankovski 944d9eeec0 Do AD check if AD is enabled. 2014-10-10 09:06:00 +02:00
Jan-Willem van der Meer 19d811e6bf Make LDAP authentication work with multiple LDAP servers 2014-10-09 19:09:36 +02:00
Marin Jankovski b4828f4cf6 Enable markdown pipeline filters from inside gitlab. 2014-10-09 13:33:38 +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 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 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 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
Dmitriy Zaporozhets 0bf99f6557 Developers can push to wiki repo. Protected branches does not affect wiki repo any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-07 16:05:24 +03: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 7bcd6f79a4 Merge pull request #7963 from cirosantilli/factor-previewable 
Factor markup? || gitlab_markdown? into new method
 2014-10-07 12:19:28 +03:00
Vinnie Okada 9f0083a96c Add task lists to issues and merge requests 
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input.  Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks.  Task status is also displayed in the MR and issue
lists.
 2014-10-05 22:15:27 -05:00