delta/gitlab/gitlab-ce.git/lib, branch user-agnostic-docker-example gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'git_hook_messages_ce' of dev.gitlab.org:gitlab/gitlabhq 2014-11-24T17:41:06+00:00 Jacob Vosmaer contact@jacobvosmaer.nl 2014-11-24T17:41:06+00:00 b70cee9c2fde878d77b1540c31e7560ea9f97460 Conflicts: GITLAB_SHELL_VERSION 
Conflicts:
	GITLAB_SHELL_VERSION
Git hook messages: wiki access fix 2014-11-24T14:21:35+00:00 Valery Sizov vsv2711@gmail.com 2014-11-24T14:21:35+00:00 ef944e83ec8c439350df03c3bb9b5bbb3f68f406 






Explain why we create a StringIO
2014-11-20T14:54:39+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-11-20T14:54:39+00:00

458f8c1f80ff20ba3d6e439c65500ed1c1d81ba4












Add CRON=1 backup setting for quiet backups
2014-11-20T14:46:04+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-11-20T14:46:04+00:00

7c54c63ac14eb8f5ce0e364d709988fcfe4dda64












Revert "gitlab shell works if multiple rubies installed"
2014-11-18T15:14:36+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-11-18T15:14:36+00:00

f7bf892cca6bb8106194c14bef1ed9ddfc26ec91

This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.





This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.







Better message for failed pushes because of git hooks
2014-11-18T11:10:07+00:00

Valery Sizov
vsv2711@gmail.com

2014-11-14T16:23:55+00:00

53bf52f191612df92d993cbcd3c4d6c89ab9c95a

Conflicts:
	lib/gitlab/git_access.rb
	spec/lib/gitlab/git_access_spec.rb





Conflicts:
	lib/gitlab/git_access.rb
	spec/lib/gitlab/git_access_spec.rb







gitlab shell works if multiple rubies installed
2014-11-18T10:38:23+00:00

Ciro Santilli
ciro.santilli@gmail.com

2014-10-22T08:54:59+00:00

533f4cdf30b38c587f7a91f0dfd898b907ecd944

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.





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.







Correctly restore empty repositories.
2014-11-13T12:09:47+00:00

Dimitry Andric
d.andric@activevideo.com

2014-11-13T12:09:47+00:00

4a5044e30269f8b3c6c075093cd4646a478231c7

If a project is being restored, but there is no bundle file, the project was
empty when it was backed up.  In this case, just use git init --base to create a
new bare repository.





If a project is being restored, but there is no bundle file, the project was
empty when it was backed up.  In this case, just use git init --base to create a
new bare repository.







Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_task
2014-11-12T12:40:36+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2014-11-12T12:40:36+00:00

dfcc59a92b9c3740cf4c1ee34a8fb45753bfbe20

fixes the `block_removed_ldap_users` rake task




fixes the `block_removed_ldap_users` rake task






Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-11-12T11:20:01+00:00

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2014-11-12T11:20:01+00:00

9a96a8270ba0377b3d634efa0f2c41afdc871156