Jan-Willem van der Meer
f4c64d44c2
Migrate LDAP users as well
2014-10-16 10:45:46 +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
7b479156ec
Merge remote-tracking branch 'origin/master' into feature-multi-ldap-servers-merge-master
2014-10-15 14:25:45 +02:00
Jan-Willem van der Meer
435b6f9135
Remove pending status from test
2014-10-15 14:25:06 +02:00
Dmitriy Zaporozhets
df9984aea8
Merge branch 'ce-upstream' into 'master'
...
CE upstream
I dont fixed next files:
```
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: lib/gitlab/ldap/access.rb
both modified: lib/gitlab/ldap/person.rb
both modified: spec/lib/gitlab/ldap/access_spec.rb
```
See merge request !197
2014-10-15 11:54:52 +00:00
Jan-Willem van der Meer
4919848624
Set a default sync time if not available
2014-10-15 08:20:08 +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
Jan-Willem van der Meer
103419be96
Add ldap callback definitions to initializer
2014-10-14 17:26:42 +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
Dmitriy Zaporozhets
e3bd17a7ba
Merge branch 'feature-multiple-ldap-servers' into 'master'
...
Feature multiple ldap servers
Update the code so Gitlab-EE can support multiple LDAP servers
See merge request !1172
2014-10-14 15:01:37 +00:00
Dmitriy Zaporozhets
4bebdc0946
Merge branch 'libravatar_documentation' into 'master'
...
Libravatar documentation
Fixes #1248
See merge request !1173
2014-10-14 13:27:56 +00:00
Dmitriy Zaporozhets
ef03f4a429
Merge branch 'notification_level_note' into 'master'
...
Notification level note
Fixes #1406
See merge request !1174
2014-10-14 13:24:10 +00:00
Jan-Willem van der Meer
b4f7b387d0
Explain new configuration options.
...
And add some advertisement to use GitLab EE
2014-10-14 15:03:53 +02:00
Jan-Willem van der Meer
fedb223b09
Add valid LDAP server for testing
2014-10-14 13:52:15 +02:00
Sytse Sijbrandij
5d59890b9d
Another link to GitHub flow.
2014-10-14 13:21:42 +02:00
Jan-Willem van der Meer
6ce65a3e95
Use Hash syntax for LDAP server declaration
2014-10-14 13:13:59 +02:00
Marin Jankovski
1d432e96bc
Add a link to libravatar doc in gitlab.yml.example.
2014-10-14 12:31:47 +02:00
Marin Jankovski
f174800b20
Different wording for notification note.
2014-10-14 12:28:30 +02:00
Jan-Willem van der Meer
9bf7bfda20
Remove unused methods
2014-10-14 12:09:24 +02:00
Marin Jankovski
920eb7abc4
Add a note about notification for a project.
2014-10-14 12:02:05 +02:00
Marin Jankovski
9abe5d36d7
Add libravatar documentation.
2014-10-14 11:23:33 +02:00
Jan-Willem van der Meer
ab04096c6c
Add explaining note to authentication method [skip ci]
2014-10-14 11:16:47 +02:00
Dmitriy Zaporozhets
9d2840fba2
Merge branch 'skip_ad_check' into 'master'
...
Skip ad check
Fixes #181
See merge request !193
2014-10-14 09:02:39 +00: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
23b692c701
Add specs for authentication and config
2014-10-14 09:31:38 +02:00
Jan-Willem van der Meer
fc5bfd1dc1
Move dynamic omniauth declarations to initializer
2014-10-14 09:31:06 +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
Robert Schilling
672bd3902d
Merge pull request #8027 from bbodenmiller/patch-7
...
update changelog
2014-10-13 18:30:18 +02:00
Ben Bodenmiller
014919340a
update changelog
...
Change log entry for https://github.com/gitlabhq/gitlabhq/pull/8020
2014-10-13 09:07:23 -07:00
Dmitriy Zaporozhets
e261de255d
Merge pull request #7942 from cirosantilli/commit-changes-uppercase
...
Make new and edit file submit more uniform
2014-10-13 18:47:46 +03: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
6c0994a3b3
Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-servers
...
Conflicts:
app/controllers/omniauth_callbacks_controller.rb
2014-10-13 17:07:53 +02:00
Dmitriy Zaporozhets
05fca6bfc2
Merge branch 'sorting-users-in-admin' into 'master'
...
Sorting users in admin
See merge request !1170
2014-10-13 13:59:17 +00:00
Valery Sizov
4e0da2325b
Admin: user sorting
2014-10-13 16:07:57 +03:00
Jan-Willem van der Meer
e1cf9c15eb
Apply configuration changes for Multiple LDAP servers
2014-10-13 14:04:10 +02:00
Jan-Willem van der Meer
3cd5abf635
Add config changes for mutliple LDAP support (EE only)
2014-10-13 13:56:54 +02:00
Dmitriy Zaporozhets
b2b71ffadc
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-10-13 14:47:06 +03: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
a7e071e982
Add refactoring for multiple LDAP server support
...
These changes are ported from EE to CE. Apply changes for app directory
2014-10-13 13:39:54 +02:00
