delta/gitlab/gitlab-shell.git - gitlab.com: gitlab-org/gitlab-shell.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge branch 'working_gitlab_url' into 'master'	Dmitriy Zaporozhets	2014-07-04	1	-1/+5
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a default for gitlab_url that usually works This default lets gitlab-shell connect to Unicorn directly, instead of going through Nginx. This has the following benefits: - the majority of users no longer has to edit the `gitlab_url`; - avoid issues when the external GitLab web address does not resolve on the GitLab server itself; - avoid SSL certificate issues. See merge request !32
\| * \| \| \|	Mention Unicorn on a domain socket as an exception	Jacob Vosmaer	2014-06-20	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Use a default for gitlab_url that usually works	Jacob Vosmaer	2014-06-20	1	-1/+4
\|/ / / /
* \| \| \|	Bump versionv1.9.6	Dmitriy Zaporozhets	2014-06-10	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'require_timeout' into 'master'	Dmitriy Zaporozhets	2014-06-10	2	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expliclity require 'timeout' from the stdlib
\| * \| \| \|	Expliclity require 'timeout' from the stdlib	Jacob Vosmaer	2014-06-10	2	-0/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids getting the following error on some platforms: NameError: uninitialized constant GitlabKeys::Timeout
* \| \| \|	Version 1.9.5v1.9.5	Dmitriy Zaporozhets	2014-05-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'add-key-lock' into 'master'	Dmitriy Zaporozhets	2014-05-31	3	-3/+7
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use lock file when add new entries to authorized_keys Fixes #21
\| * \| \| \|	Create keys fixtures in test	Dmitriy Zaporozhets	2014-05-31	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Use authorized_keys lock when add new key to file	Dmitriy Zaporozhets	2014-05-31	2	-3/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'lock_file_location' into 'master'	Dmitriy Zaporozhets	2014-05-31	3	-2/+16
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lock file location
\| * \| \| \|	Put authorized_keys.lock in the .ssh directory	Jacob Vosmaer	2014-05-30	3	-2/+16
\|/ / / /
* \| \| \|	Version 1.9.4v1.9.4	Dmitriy Zaporozhets	2014-04-24	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'authorized_keys_lock' into 'master'	Dmitriy Zaporozhets	2014-04-22	4	-14/+74
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Authorized keys lock
\| * \| \| \|	Mention lock file in changelog	Dmitriy Zaporozhets	2014-04-18	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Use lock file when add or remove keys from authorized_keys file	Dmitriy Zaporozhets	2014-04-18	3	-14/+71
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This prevents concurrent modification of authorized_keys file Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'spec_popen_fix_1.9.3' into 'master'	Dmitriy Zaporozhets	2014-04-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spec failure in Ruby 1.9.3
\| * \| \| \|	Invoke IO.popen correctly for Ruby 1.9.3	Jacob Vosmaer	2014-04-15	1	-1/+1
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this change, tests in gitlab_projects_spec were passing on Ruby 2.0.0 but not on 1.9.3.
* \| \| \|	Use h1 headers in readme	Dmitriy Zaporozhets	2014-04-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Inline badges	Dmitriy Zaporozhets	2014-04-14	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Fix tests	Dmitriy Zaporozhets	2014-04-14	8	-126/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge pull request #145 from lsjostro/fix_env	Jacob Vosmaer	2014-04-11	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Preserve LD_LIBRARY_PATH for Kernel::exec
\| * \| \| \|	set LD_LIBRARY_PATH for Kernel::exec	Lars Sjöström	2014-03-26	1	-1/+1
\| \|/ / /
* \| \| \|	Version 1.9.3v1.9.3	Dmitriy Zaporozhets	2014-04-03	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Fix fatal: bad object 0000 when do new branch push	Dmitriy Zaporozhets	2014-04-03	1	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Version 1.9.2v1.9.2	Dmitriy Zaporozhets	2014-04-03	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Make force push detection actually work	Dmitriy Zaporozhets	2014-04-03	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge pull request #128 from ↵	Dmitriy Zaporozhets	2014-04-03	2	-2/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Popl7/add-better-branch-protection-against-history-rewrite-and-deletion protect protected branched to force updates
\| * \| \|	first setup to protect protected branched to force updates	Steven Thonus	2014-03-25	2	-2/+7
\|/ / / \| \| \| \| \| \| \| \| \|	rebased for new code
* \| \|	Version 1.9.1v1.9.1	Dmitriy Zaporozhets	2014-03-20	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Pass tag name to update hook too	Dmitriy Zaporozhets	2014-03-20	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Version 1.9.0v1.9.0	Dmitriy Zaporozhets	2014-03-20	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'improve-git-update' into 'master'	Dmitriy Zaporozhets	2014-03-20	2	-21/+23
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Improve Git Update
\| * \| \|	Fix tests	Dmitriy Zaporozhets	2014-03-19	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Send api.allowed? request for both http and ssh push	Dmitriy Zaporozhets	2014-03-19	2	-21/+22
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	version 1.8.5v1.8.5	Dmitriy Zaporozhets	2014-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'fix_changelog' into 'master'	Dmitriy Zaporozhets	2014-03-15	1	-1/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Changelog
\| * \| \|	Move batch-add-keys under the right version	Jacob Vosmaer	2014-03-14	1	-1/+3
\|/ / /
* \| \|	Merge branch 'batch_key_import' into 'master'	Dmitriy Zaporozhets	2014-03-14	4	-2/+69
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Batch Key Import
\| * \| \|	Add gitlab-keys batch-add-keys	Jacob Vosmaer	2014-03-14	4	-1/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This command is intended to be called by the GitLab Rails code when restoring an application backup.
\| * \| \|	Generate key_line in separate method	Jacob Vosmaer	2014-03-14	1	-1/+5
\|/ / /
* \| \|	Version 1.8.4v1.8.4	Dmitriy Zaporozhets	2014-03-13	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Add process wait for import	Dmitriy Zaporozhets	2014-03-13	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Dont import repo if exists	Dmitriy Zaporozhets	2014-03-13	2	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'import-timeout' into 'master'v1.8.3	Dmitriy Zaporozhets	2014-03-12	5	-11/+57
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Import Timeout
\| * \| \|	Use KILL instead of TERM	Dmitriy Zaporozhets	2014-03-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Use large repo instead one with prompt	Dmitriy Zaporozhets	2014-03-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	change seed repo	Dmitriy Zaporozhets	2014-03-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Use Process spawn	Dmitriy Zaporozhets	2014-03-12	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Changelog entry and new version	Dmitriy Zaporozhets	2014-03-12	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>