home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,045 Commits 48 Branches 340 Tags
7b928de03bc2baf7edbd087971d82e07bd5c1957
Commit Graph
415 Commits
Author SHA1 Message Date
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
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Jacob Vosmaer 458f8c1f80 Explain why we create a StringIO 2014-11-20 15:54:39 +01:00
Jacob Vosmaer 7c54c63ac1 Add CRON=1 backup setting for quiet backups 2014-11-20 15:46:04 +01: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
Jacob Vosmaer dfcc59a92b Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task 
fixes the `block_removed_ldap_users` rake task
 2014-11-12 13:40:36 +01:00
Valery Sizov 1a7e347635 Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences 
Conflicts:
	CHANGELOG
 2014-11-12 13:14:13 +02:00
Marvin Frick 1f902c2464 fixes the block_removed_ldap_users rake task 
In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was
changed. I assume this rake task was an oversight in the refactoring of
the changed class.

While being on it, I noticed that already blocked users cannot be
blocked again.
 2014-11-12 12:06:24 +01:00
Dmitriy Zaporozhets 6641341b65 Merge pull request #8254 from cirosantilli/factor-get-shell-version 
Factor GITLAB_SHELL_VERSION get method
 2014-11-08 11:04:56 +02:00
Ciro Santilli e4a38e4471 Factor using Repository#path_to_repo 2014-11-05 17:51:49 +01:00
Ciro Santilli f36db59d97 Factor GITLAB_SHELL_VERSION get method 2014-11-05 17:16:04 +01:00
Jacob Vosmaer e00e67db42 Drop all Postgres sequences during backup restore 2014-10-28 18:52:21 +01:00
Dmitriy Zaporozhets f4178f9601 Merge pull request #8005 from cirosantilli/settings-to-gitlab-config 
Use Gitlab.config instead of Settings everywhere
 2014-10-27 19:18:48 +02:00
Robert Schilling 199029b842 Merge pull request #8158 from cirosantilli/basename-dirname-split 
Merge File basename and direname into split
 2014-10-25 10:35:07 +02:00
Ciro Santilli 706b6b5acb Fix import.rake failed import if project name is 
also an existing namespace. E.g., when trying to import
group/root.git, that would fail if there is an user called root.
 2014-10-24 17:26:33 +02:00
Ciro Santilli 9be12dd9ca Merge File basename and direname into split 
Faster because only does one split in that case.
 2014-10-23 23:10:54 +02:00
Jacob Vosmaer 90e960f4ce Merge pull request #8088 from cirosantilli/sh-str-to-args 
Use argument list for sh instead of string
 2014-10-23 12:23:40 +02:00
Dmitriy Zaporozhets ce01916a68 Merge pull request #8026 from HerrBerg/master 
rake:import:repos: fix exclude wiki regex for importing repositories
 2014-10-22 16:55:25 +03:00
Dmitriy Zaporozhets d79c5f78b6 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 13:15:28 +03:00
Dmitriy Zaporozhets 829bd6ff38 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	lib/gitlab/ldap/adapter.rb
 2014-10-22 11:23:18 +03:00
Dmitriy Zaporozhets 05f19392b7 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:11:18 +03:00
Dmitriy Zaporozhets da21b9e7d0 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-21 18:26:40 +03:00
Ciro Santilli a3623a9691 Use argument list for sh instead of string 
Faster, more portable and less error prone since no shell expansion.
 2014-10-18 22:49:56 +02:00
Ciro Santilli 2901042196 Replace match with end_with: more readable, faster 2014-10-18 22:41:39 +02:00
Jan-Willem van der Meer f4c64d44c2 Migrate LDAP users as well 2014-10-16 10:45:46 +02:00
Ciro Santilli 39c66c822e Use Gitlab.config instead of Settings everywhere 2014-10-15 23:01:31 +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
HerrBerg fc6a291af3 fix exclude wiki regex 
the new regex allows importing repositories with repository name ending with wiki but still exclude gitlab wiki repositories
 2014-10-13 16:26:35 +02:00
Marc Aubé ae5381f2cc Update import.rake 
Output a message when a repo is skipped
 2014-10-07 14:13:50 -04:00
Dmitriy Zaporozhets 522d754dfe Try wear_merged! without argument 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 11:43:16 +03:00
Dmitriy Zaporozhets 6fa81e5d58 Add rspec to test_ci 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 15:55:03 +03:00
Dmitriy Zaporozhets 99a7bf8823 Separate rake test for simplecov 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-30 15:54:21 +03:00
Dmitriy Zaporozhets 28b6f09fcc Merge pull request #7823 from cirosantilli/test-fetch-shell 
Only clone GitLab Shell on tests if necessary.
 2014-09-24 12:58:10 +03:00
Ciro Santilli 065ab3e5f3 Only clone GitLab Shell on tests if necessary. 2014-09-22 21:37:52 +02:00
Dmitriy Zaporozhets 8cd882355e Merge branch '7-4-pre' into 'master' 
7.4 development

Development branch during `master` code freeze for 7.3

See merge request !1096
 2014-09-22 17:25:49 +00:00
Jacob Vosmaer 4f61061cfb Support sockets in 'rake gitlab:shell:install' 2014-09-22 15:02:46 +02:00
Dmitriy Zaporozhets 8bff9a4098 Merge branch 'refator-members-logic' of https://dev.gitlab.org/dzaporozhets/gitlabhq into 7-4-pre 2014-09-17 21:31:41 +03:00
Jacob Vosmaer 45a6b62407 Check for hooks directory symlink in gitlab:check 2014-09-16 17:11:25 +02:00
Dmitriy Zaporozhets 8210d81381 Replace old references of users_project & users_group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:51:54 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Jacob Vosmaer 042465c448 Use create-hooks instead of rewrite-hooks.sh 
The rewrite-hooks.sh script is a deprecated wrapper for gitlab-shell's
create-hooks script.
 2014-09-08 10:16:15 +02:00
Ben Bodenmiller 5e2bce0fef change git to git bin path 2014-08-30 17:09:32 -07:00
Jacob Vosmaer 37d6293842 Write authorized_keys in tmp/tests during tests 
This should reduce the number of gitlab-shell error messages while the
tests run.
 2014-08-26 11:33:26 +02:00
Jacob Vosmaer b752ee8aa9 Add rake task to drop a project's PostReceive jobs 2014-08-21 16:02:04 +02:00
Dmitriy Zaporozhets dbb1cb30a3 Merge pull request #7441 from bbodenmiller/patch-7 
add git config --global core.autocrlf check
 2014-08-13 16:39:58 +03:00
Ben Bodenmiller ecd33c9d92 add git config --global core.autocrlf check 
core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
 2014-08-04 20:41:20 -07:00
Dmitriy Zaporozhets 394ac378f8 Fix markdown tests. Use new repo for testing. Fixed gitlab-shell test setup 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 23:05:30 +03:00
Dmitriy Zaporozhets 3a017a4e3c Get gitlab-shell verion from file for install rake task 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-31 22:34:25 +03:00