home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,045 Commits 48 Branches 340 Tags
7b928de03bc2baf7edbd087971d82e07bd5c1957
Commit Graph
437 Commits
Author SHA1 Message Date
Valery Sizov cbabc0b2f3 Kerberos: update docs 2014-12-15 18:07:03 +02:00
Dmitriy Zaporozhets 8eb29cd5d6 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:32:15 +02:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2014-12-11 18:12:45 +02:00
Valery Sizov 7d8dfccf70 speed up migration to identities 2014-12-08 15:15:11 +02:00
Dmitriy Zaporozhets 1961b59070 Add locked_at to merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:42:26 +02:00
Dmitriy Zaporozhets 9ceccf7cf5 Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:08:26 +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
Marin Jankovski df5b37376d Add merge request rebase enabled column to projects table. 2014-11-26 13:15:42 +01:00
Jacob Vosmaer 4053c055be Add missing timestamps to the 'members' table 2014-11-21 15:02:23 +01:00
Marin Jankovski cf6b622686 Add audit event table. 2014-11-18 16:51:05 +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
Dmitriy Zaporozhets f56541de9a Revert "Create dev fixture projects with fixed visibility" 
This reverts commit a9fadce361.
 2014-11-10 16:17:04 +02:00
Marin Jankovski 1d337defec Merge pull request #8168 from cirosantilli/dev-fixtures-visibility 
Create dev fixture projects with fixed visibility
 2014-11-07 15:26:48 +01:00
Marin Jankovski e45d5f7f44 Fix broken ldap migration. 2014-11-07 13:50:54 +01:00
Don Luchini 019c0f9e0f Remove unnecessary lines. 2014-11-05 08:57:05 -05:00
Don Luchini bc403356bb Do not require immediate password reset if specifying one when seeding database. 2014-11-04 10:02:38 -05:00
Valery Sizov c9470f5c78 Ability to block commits with certain filenames 2014-11-03 18:22:43 +02:00
Valery Sizov cc34c09e69 update schema 2014-10-31 16:36:01 +02:00
Valery Sizov 76764338dd Git Hook to check whether author is a GitLab member 2014-10-31 16:19:58 +02:00
Dmitriy Zaporozhets ff48e1eeb7 Save only valid record in service migrations 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-31 11:12:41 +02:00
Drew Blessing c3104abfd4 Fix serialize migration 2014-10-30 05:01:21 -05:00
Valery Sizov a62ad80a0f Git hooks for checking email 2014-10-29 11:42:51 +02:00
Ciro Santilli a9fadce361 Create dev fixture projects with fixed visibility 2014-10-26 11:34:50 +01:00
Dmitriy Zaporozhets b99eef4481 Merge branch 'ce_master' into 'master' 
CE master to EE master

See merge request !203
 2014-10-17 14:07:08 +00:00
Dmitriy Zaporozhets 32d0bf3afd Fix snippets seeds 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-16 16:50:09 +03: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
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 83a3facb17 Add provider to LDAP group links 2014-10-10 16:16:29 +02:00
Valery Sizov 47f539f5a6 Snippets: public/internal/private 2014-10-09 17:09:53 +03:00
Marin Jankovski bbc52b0000 Use double quotes because we are inserting password now. 2014-10-07 11:48:25 +02:00
Marin Jankovski eceef546d1 Add slack service migration. 2014-10-06 16:50:24 +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
Ciro Santilli 789b427592 Fix dev merge seed: update testme to gitlab-test. 2014-09-30 17:34:46 +02:00
Dmitriy Zaporozhets efcac2befc Merge pull request #7873 from cirosantilli/testme-to-gitlabtest 
Replace testme with gitlab-test.
 2014-09-29 19:49:59 +03:00
Dmitriy Zaporozhets 0a1176d62d Merge pull request #7897 from cirosantilli/predictable-merge-requests-dev-seed 
Add predictable merge requests on dev seed.
 2014-09-29 17:46:08 +03:00
Ciro Santilli 1ba26184eb Add predictable merge requests on dev seed. 2014-09-29 13:55:31 +02:00
Ciro Santilli a963e8c293 Prevent email sending on admin dev seed. 2014-09-29 13:38:54 +02:00
Ciro Santilli ac55373ff3 Replace empty? || nil? with blank?. 2014-09-27 11:15:08 +02:00
Ciro Santilli b49dd2c573 Replace testme with gitlab-test. 2014-09-27 10:11:20 +02:00
Dmitriy Zaporozhets e4bc359841 Fix dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 20:19:11 +03:00
Jacob Vosmaer 447b4a49e6 Update db/schema.rb for JSON service properties 2014-09-15 15:25:13 +02:00
Jacob Vosmaer be34a0c939 Merge remote-tracking branch 'subscribers/serialize_service_properties' into merge-79190fe06b-7.3.0-pre 2014-09-15 15:22:44 +02:00
Jacob Vosmaer f22a795e04 Fix db/schema.rb after merge 
First I did `rake dev:setup` at 405a5acbb5f8; then `rake db:migrate` at
e93523ed31.
 2014-09-15 11:29:19 +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
Dmitriy Zaporozhets 1aa48174db Fix STI+polymorphic for Group <-> GroupMember 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 21:52:54 +03:00
Dmitriy Zaporozhets 13af7de941 Fix migration and association for new members table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 20:38:57 +03:00
Dmitriy Zaporozhets e9b32005eb Migrate old membership objects to new Member model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 18:09:23 +03:00
Dmitriy Zaporozhets 3503b504ea Add members table migration 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 17:18:58 +03:00