home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,261 Commits 48 Branches 340 Tags
b46ce7b0eeaff95c94cef6dc87e8a79819649949
Commit Graph
225 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Vinnie Okada ad0ca0499a Merge branch 'master' into fix-restricted-visibility 
Conflicts:
	db/schema.rb
 2015-03-14 10:49:11 -06:00
Dmitriy Zaporozhets be4d340381 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/uploads_controller.rb
	app/models/application_setting.rb
	app/models/project_services/issue_tracker_service.rb
	app/views/projects/services/_form.html.haml
	db/schema.rb
	doc/integration/README.md
	features/steps/groups.rb
 2015-03-11 18:41:41 -07:00
Vyacheslav Slinko 61ed518781 Make email display name configurable 2015-03-11 11:04:23 +07:00
Vinnie Okada cacac147de Move restricted visibility settings to the UI 
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
 2015-03-07 13:11:08 -07:00
Dmitriy Zaporozhets 8dcffdcdc1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
	app/models/service.rb
	app/views/devise/shared/_signin_box.html.haml
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/github.md
	features/project/service.feature
	lib/gitlab/github_import/client.rb
 2015-03-02 16:10:12 -08:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
 2015-02-16 11:50:30 -08:00
Dmitriy Zaporozhets a56496f1cb Merge branch 'ghe_importer' into 'master' 
GHE importer

See merge request !306
 2015-02-12 19:27:48 +00:00
Valery Sizov 1be5291a2b GHE importer: moved settings login to initializer 2015-02-11 10:36:21 +02:00
Dmitriy Zaporozhets 3d369a5b85 Remove settings from gitlab.yml.example which we already have in UI 2015-02-10 09:30:39 -08:00
Valery Sizov 9de15c1e0f GHE importer: single configuration for auth and importer 2015-02-10 15:18:28 +02:00
Dmitriy Zaporozhets 49d6721329 Add gitlab to oauth providers 2015-02-07 13:49:05 -08:00
Marin Jankovski c4b97dc2dc Update the issue closing regex to count on the Jira issue mentions. Make sure push data is provided for the service. 2015-02-06 10:31:00 -08:00
Valery Sizov fb638cc814 GHE importer 2015-02-06 10:21:30 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Jacob Vosmaer 087c4cbc3c Make 'plain', port 389 the default for LDAP 2015-01-28 11:34:33 +01:00
Dmitriy Zaporozhets d005c44816 Mix wrong comment about signup 2015-01-22 10:38:24 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
jubianchi b21a2d821a Allow commit messages to close several issues at once (thanks @123Haynes 
for his work and help)
 2015-01-20 10:45:48 +01:00
Drew Blessing a3ef61de92 Merge pull request #8040 from drag00n/updatedhint 
Use full path from root of project.
 2015-01-18 22:02:46 -06:00
drag00nanddrag00n b97218db4d Use full path from root of project. 
Remove markdown syntax from config file
 2015-01-18 21:34:35 -05:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Jacob Vosmaer af56c1dd32 White-list requests from 127.0.0.1 
On some misconfigured GitLab servers, if you look in production.log it looks
like all requests come from 127.0.0.1. To avoid unwanted banning we
white-list 127.0.0.1 with this commit.
 2015-01-06 16:56:56 +01:00
Jacob Vosmaer 62ea02740d Block Git HTTP Basic Auth after 10 failed attempts 2014-12-15 18:57:42 +01: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
Robert Djurasaj bc16f81321 Update time zone rake task for production. Resolves #8387 2014-11-25 11:18:56 -07:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Valery Sizov 3fcd75a911 Merge CE master into EE master 
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
 2014-11-13 17:05:12 +02:00
Marin Jankovski 5135b3829d Change comment in gitlab.yml about automatic ldap sync. 2014-11-03 08:13:09 +01:00
Marin Jankovski e69b5f19c5 Place the settings that are valid for all ldap servers in a correct place. 2014-10-31 12:40:01 +01:00
Marin Jankovski 8064041373 Add time configuration option for LDAP user daily sync. 2014-10-29 13:32:16 +01:00
Marin Jankovski d504ca8a0c Add settings to disable email sending from GitLab. 2014-10-27 13:02:12 +01:00
Sullivan SENECHAL 593a287c8d Add timezone configuration to gitlab.yml 2014-10-21 11:27:16 +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 3cd5abf635 Add config changes for mutliple LDAP support (EE only) 2014-10-13 13:56:54 +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
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
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +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