Dmitriy Zaporozhets
b99eef4481
Merge branch 'ce_master' into 'master'
...
CE master to EE master
See merge request !203
2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets
f8cdd62e22
Fix account existing blocking
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-17 14:08:02 +03:00
Jan-Willem van der Meer
d9bfebc0e8
Add regressiontest to verify allow_single_sign_on setting
...
verification for #1677
Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer
104e146268
Merge branch 'feature-multi-ldap-servers-group-sync' into feature-migrate-to-multiple-ldaps
2014-10-16 10:46:17 +02:00
Jan-Willem van der Meer
f4c64d44c2
Migrate LDAP users as well
2014-10-16 10:45:46 +02:00
Jan-Willem van der Meer
09ccea3590
Remove duplicated comment
2014-10-15 22:42:51 +02:00
Jan-Willem van der Meer
7d3976eec4
Add task to migrate LDAP group links to multiple LDAP setup
...
This still requires some additional documentation
2014-10-15 15:28:54 +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
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
Dmitriy Zaporozhets
7a01d0cc74
Merge branch 'bug_with_apostrophe' into 'master'
...
Bug with apostrophe when at mentioning users
This fixes the situation where mentioning user with apostrophe at the end causes a link to issue 39 if the project has that issue, so `@marin` would look like `@marin's`.
Fixes #1034
See merge request !1165
2014-10-12 18:50:55 +00:00
Dmitriy Zaporozhets
b09fd2337a
Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master'
...
Enabling markdown pipelines from gitlab
Define which markdown pipelines are used in GitLab from application instead from gem.
See merge request !1164
2014-10-12 18:33:27 +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
3702eb5443
Add new endpoint for specific ldap group listing
2014-10-10 13:03:21 +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
be14c7a83f
Add a comment on why we are using backward compatible ciphers.
2014-10-10 09:44:08 +02:00
Marin Jankovski
8ddb2be69a
Revert "update ssl_ciphers"
...
This reverts commit c41e5f5018
2014-10-10 09:38:39 +02:00
Marin Jankovski
944d9eeec0
Do AD check if AD is enabled.
2014-10-10 09:06:00 +02:00
Marin Jankovski
fc2adfb6e4
Add a comment why this is done.
2014-10-10 08:32:05 +02:00
Marin Jankovski
1d14676e0c
Substitute right single quote back with apostrophe.
2014-10-10 08:24:58 +02:00
Jan-Willem van der Meer
19d811e6bf
Make LDAP authentication work with multiple LDAP servers
2014-10-09 19:09:36 +02:00
