Dmitriy Zaporozhets
96a3f0e0a8
Fix rubocop issues
2015-02-04 18:26:41 -08:00
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
cc39bca3fa
Rubocop: Style/AlignHash enabled
2015-02-02 21:15:44 -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
Dmitriy Zaporozhets
633fb8ab6b
Prevent 500 error on ldap group links page
...
If group has links to ldap servers that are disabled or removed from
gitlab config.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-08 15:58:01 +02: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
Valery Sizov
1a80d13a39
Multi-provider auth. LDAP is not reworked
2014-12-04 13:01:50 +02:00
Valery Sizov
9a3d36505f
Merge branch 'ee_master' into 7-4-stable-ee
...
Conflicts:
VERSION
2014-10-27 13:17:14 +02:00
Jacob Vosmaer
4272926f55
Fix merge conflict in lib/gitlab/ldap/adapter.rb
2014-10-24 13:58:28 +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
Jacob Vosmaer and Valery Sizov
e8da077d4f
Fix LDAP authentication for Git HTTP access
...
Conflicts:
CHANGELOG
2014-10-23 17:53:19 +03:00
Jacob Vosmaer
6b2b20af41
Fix LDAP authentication for Git HTTP access
2014-10-23 14:21:58 +02:00
Dmitriy Zaporozhets
a6a0bb4f2d
Merge branch '7-4-stable-ee' into 'master'
...
7-4 stable-ee to master
See merge request !212
2014-10-22 11:43:09 +00:00
Dmitriy Zaporozhets
829bd6ff38
Fix rake gitlab:ldap:check
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
lib/gitlab/ldap/adapter.rb
2014-10-22 11:23:18 +03:00
Dmitriy Zaporozhets
37e09858e8
Fix rake gitlab:ldap:check
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-22 11:12:33 +03:00
Dmitriy Zaporozhets
da21b9e7d0
Fix rake gitlab:ldap:check
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-21 18:26:40 +03:00
Jan-Willem van der Meer
0f53615140
Make AD check server specific
2014-10-17 17:14:23 +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
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
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
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
83a3facb17
Add provider to LDAP group links
2014-10-10 16:16:29 +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
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
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
