Jacob Vosmaer
159eeecef1
Restore Settingslogic.new from 18d87dcf91
2014-10-21 11:27:41 +02:00
Jacob Vosmaer
8beca98d73
Fix CE-EE LDAP merge conflicts
2014-10-21 09:55:13 +02:00
Valery Sizov
e769822595
Merge branch '7-4-stable' into to_ee_stable_from_ce_stable
...
Conflicts:
config/initializers/1_settings.rb
config/initializers/7_omniauth.rb
features/admin/groups.feature
features/steps/admin/groups.rb
2014-10-20 19:59:36 +03:00
Jan-Willem van der Meer and Dmitriy Zaporozhets
3d3726a026
Default the LDAP server label to LDAP
2014-10-20 16:38:08 +03:00
Jan-Willem van der Meer and Dmitriy Zaporozhets
49bd981200
Prevent redeclaration of LDAP strategy
2014-10-20 16:38:07 +03:00
Jan-Willem van der Meer
0ebe09e491
Only initialize if ldap is enabled
2014-10-16 10:32:54 +02:00
Jan-Willem van der Meer
18d87dcf91
Ensure each server block is a settingsLocic object
2014-10-16 10:32:29 +02:00
Jan-Willem van der Meer
dcf6c26075
Only enable LDAP providers if LDAP is enabled
2014-10-15 09:53:16 +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
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
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
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
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
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
Jan-Willem van der Meer
948a7a12b5
Don't change the providername without migrating
2014-10-13 10:38:02 +02:00
Jan-Willem van der Meer
faf54d525c
Name the default provider main, to avoid name collisions
2014-10-10 10:57:09 +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
Jan-Willem van der Meer
1835fceb4b
Make allow_username_or_email_login server specific
2014-10-10 09:40:31 +02:00
Jan-Willem van der Meer
c832c50c87
Do not use primary flag for LDAP servers
2014-10-10 09:36:54 +02:00
Jan-Willem van der Meer
5b38186867
Add note for refactoring
2014-10-10 09:12:16 +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
d6cabd2732
Add explanation about new gitlab.yml attributes
2014-10-09 12:13:28 +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
ee0154cd0c
Add proper ssh sync attribute key for tests
2014-10-07 17:39:53 +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
e60da677f2
Add example LDAP config for tests
2014-10-07 12:28:02 +02:00
Marin Jankovski
70776c71b0
Merge branch 'remove-annoying-i18n-deprecation' into 'master'
...
Remove annoying i18n deprecation
Thanks to this guy http://stackoverflow.com/a/20381730
Fixes #527
See merge request !197
2014-10-07 09:19:43 +00:00
Dmitriy Zaporozhets
eafac5932f
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/helpers/merge_requests_helper.rb
doc/update/README.md
lib/gitlab/reference_extractor.rb
2014-10-03 16:18:40 +03:00
Jan-Willem van der Meer
d9355ea590
Allow proper provider_name for ldap provider
2014-10-03 14:00:28 +02:00
Marin Jankovski
30c447ed2f
Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page
2014-10-02 14:38:26 +02:00
Jan-Willem van der Meer
97aa12fcc8
Dynamically initiate LDAP strategies
2014-10-02 12:45:53 +02: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
Jan-Willem van der Meer
3a358005e4
Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers
2014-10-01 17:33:50 +02:00
Dmitriy Zaporozhets
d29cbc70b2
Remove I18n.enforce_available_locales deprecation message
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-10-01 12:56:23 +03:00
Dmitriy Zaporozhets
73b92f85bc
Merge branch 'add_active_directory_ldap_option' into 'master'
...
Add active directory ldap option
Fixes #1557
See merge request !1139
2014-10-01 07:04:08 +00: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
Jacob Vosmaer
f778387e38
Add region to backup upload config in gitlab.yml
2014-09-30 12:05:07 +02:00
Jacob Vosmaer
e1f6fa6f18
Add backup upload support to the rake task
2014-09-29 15:03:08 +02:00
Dmitriy Zaporozhets
6d0ddf45ba
Raw implementation of commits stats page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-26 20:32:44 +03:00
Dmitriy Zaporozhets
20e0c9b132
Rewrite graphs feature
...
* remove commits stats page (will be replaced by graphs)
* remove additions/deletions from graph because of bad performance
* keep graph logic in gitlab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-09-26 18:04:41 +03:00
Marin Jankovski
383825145f
Add ability to remove the branded page logo.
2014-09-26 14:52:11 +02:00
Sytse Sijbrandij
de717a3335
Merge branch 'gitlab_ldap_filter' into 'master'
...
Add more LDAP user_filter documentation
See merge request !1115
2014-09-24 12:06:47 +00:00
Jacob Vosmaer
532eff6169
Add more LDAP user_filter documentation
2014-09-24 14:02:24 +02:00
Dmitriy Zaporozhets
a8fc10e3d0
Merge pull request #7317 from drpdigitalmedia/master
...
set the collation to utf8_general_ci
2014-09-23 21:33:33 +03:00
