home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,161 Commits 48 Branches 340 Tags
4e8cc3e19f7c13435c360e7ccaaa9cc860cbff34
Commit Graph
280 Commits
Author SHA1 Message Date
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 MeerandDmitriy Zaporozhets 3d3726a026 Default the LDAP server label to LDAP 2014-10-20 16:38:08 +03:00
Jan-Willem van der MeerandDmitriy 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
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 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 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 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 4ef74844c3 Adapt to new LDAP::Config class 2014-10-07 12:31:30 +02:00
Jan-Willem van der Meer d9355ea590 Allow proper provider_name for ldap provider 2014-10-03 14:00:28 +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
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 e1f6fa6f18 Add backup upload support to the rake task 2014-09-29 15:03:08 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Jan-Willem van der Meer e45861d7d9 Display multiple LDAP servers on login page 2014-09-11 16:14:54 +02:00
Jan-Willem van der Meer 8772c2a113 Add support for multiple ldap omniauth strategies 2014-09-11 15:43:28 +02:00
Jan-Willem van der Meer cd1d5b2026 Adapt LDAP settings by excluding non-host-specific settings 2014-09-11 15:42:08 +02:00
Jan-Willem van der Meer c96a1e6931 Add backwards compatibility for old ldap server definition 2014-09-11 12:00:46 +02:00
Jacob Vosmaer 185e7681d2 Move cache setup to config/application.rb 
Before this change we were trying to configure Rails.cache in an
initializer. It seems that by the time the initializers are loaded,
Rails.cache is already instantiated, so changing the settings does not
achieve anything anymore. This was causing Rails to default to a file
storage cache instead of the Redis cache, which in turn broke `rake
cache:clear`.
 2014-08-29 11:38:21 +02:00
Dmitriy Zaporozhets c1d2640b2e Merge branch 'redis_settings' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-08-28 15:03:22 +03:00
Jacob Vosmaer 0a52b70b92 Hide configuration shenanigans in a block 
I'm feeling paranoid about the scope variables like redis_config_file
get defined in. Hiding it in a block to limit the scope.
 2014-08-27 16:36:38 +02:00
Jacob Vosmaer 6d785abaa9 Rename resque_url to redis_url_string 2014-08-27 16:32:59 +02:00
Jacob Vosmaer c0b146899b Store sessions in a Redis namespace 
This makes less of a mess of the Redis root.
 2014-08-26 13:44:39 +02:00
Jacob Vosmaer 9122823afc Configure Redis cache for all environments 
Also add support for connecting to Redis with Unix sockets.
 2014-08-26 13:44:39 +02:00
Jacob Vosmaer 99b81be887 Expire Rack sessions after 1 week 2014-08-26 10:58:16 +02:00
Marin Jankovski a5d7fc81d9 Make LDAP sync time configurable. 2014-08-25 11:15:25 +02:00
Jacob Vosmaer 6ea702db9a Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-08-22 10:00:26 +02:00
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer 7567614d3b Merge tag 'v7.2.0.rc1' 
Bump version to 7.2.0.rc1

Conflicts:
	VERSION
 2014-08-18 16:12:32 +02:00
Jacob Vosmaer ec381a9308 Use new git max_size in the settings initializer 2014-08-15 11:38:32 +02:00
Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 
Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb
 2014-08-15 10:25:23 +02:00
Jacob Vosmaer 03ae6b89bd Log Sidekiq arguments 2014-07-28 16:46:36 +02:00
Ayrton Araújo 07537faca7 Add support to set satellites timeout 2014-07-21 11:50:29 -04:00