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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	masking access_token from url for logging	Valery Sizov	2015-01-13	1	-0/+1
\|/ /
* \|	Merge branch 'update_changelog' into 'master'	Sytse Sijbrandij	2014-12-15	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \|	Update changelog See merge request !50
\| *	update changelog	Valery Sizov	2014-12-15	1	-1/+1
\|/
*	Merge pull request #197 from dblessing/fix/custom_hook_output	Jacob Vosmaer	2014-11-26	1	-3/+3
\|\ \| \| \| \|	Fix custom hook output
\| *	Fix custom hook output and return values	Drew Blessing	2014-11-18	1	-3/+3
\| \|
* \|	Merge branch 'require_in_gitlab_net' into 'master'v2.4.0	Valery Sizov	2014-11-25	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing 'require_relative' in gitlab_net.rb Prevent 'uninitialized constant GitlabNet::GitAccessStatus'. See merge request !49
\| * \|	Add missing 'require_relative' in gitlab_net.rb	Jacob Vosmaer	2014-11-25	1	-0/+1
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this 'require' statement, you get the following error: ``` $ git ls-remote origin /home/git/gitlab-shell/lib/gitlab_net.rb:30:in `check_access': uninitialized constant GitlabNet::GitAccessStatus (NameError) from /home/git/gitlab-shell/lib/gitlab_shell.rb:63:in `validate_access' from /home/git/gitlab-shell/lib/gitlab_shell.rb:24:in `exec' from /home/git/gitlab-shell/bin/gitlab-shell:16:in `<main>' fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. ```
* \|	Merge branch 'git_messages' into 'master'	Valery Sizov	2014-11-24	13	-31/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better git hook messages DZ already merged it but we had to revert it because of lack of time to deploy to dev. See merge request !48
\| * \|	Revert "Revert "Merge branch 'git_hook_messages'""	Valery Sizov	2014-11-24	13	-31/+62
\|/ / \| \| \| \| \| \|	This reverts commit f8453da5868dd7a23d0f2f3da7a45e33c441d1db.
* \|	Revert "Merge branch 'git_hook_messages'"	Jacob Vosmaer	2014-11-20	13	-62/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	At least the following things were broken: - missing require for 'gitlab_access_status' in lib/gitlab_net.rb - gitlabhq master internal API returns 'true' or 'false', gitlab-shell expects JSON This reverts commit 11311a95545f967a5736cd16ab5fc37f7e658519, reversing changes made to 45444597aef3e434571de2491934ae92357ad231.
* \|	Merge branch 'git_hook_messages'	Dmitriy Zaporozhets	2014-11-19	13	-31/+62
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION
\| * \|	Show error message when git access is rejected	Valery Sizov	2014-11-14	13	-31/+62
\| \|/
* \|	Merge branch 'revert_broken_things' into 'master'v2.3.1	Valery Sizov	2014-11-19	8	-69/+51
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert broken things See merge request !6
\| * \|	Bump version	Valery Sizov	2014-11-19	1	-1/+1
\| \| \|
\| * \|	Revert "Restore hooks PATH before calling ruby."	Valery Sizov	2014-11-19	7	-68/+50
\|/ / \| \| \| \| \| \|	This reverts commit cd9e796316560eee596f2681d54a8417389bbe79.
* \|	Bump versionv2.3.0	Dmitriy Zaporozhets	2014-11-18	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge pull request #193 from cirosantilli/tag-branch-rm-double-dash	Dmitriy Zaporozhets	2014-11-18	1	-2/+2
\|\ \ \| \| \| \| \| \|	Delete tags and branches that start with hyphen
\| * \|	Delete tags and branches that start with hyphen	Ciro Santilli	2014-10-31	1	-2/+2
\| \| \|
* \| \|	Merge pull request #186 from cirosantilli/restore-path	Dmitriy Zaporozhets	2014-11-18	7	-50/+68
\|\ \ \ \| \|_\|/ \|/\| \|	Restore hooks PATH before calling ruby.
\| * \|	Restore hooks PATH before calling ruby.	Ciro Santilli	2014-11-17	7	-50/+68
\|/ /
* \|	Bump versionv2.2.0	Dmitriy Zaporozhets	2014-11-11	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Bump version	Dmitriy Zaporozhets	2014-11-07	1	-1/+1
\| \|
* \|	Merge pull request #196 from dblessing/feature/custom_hooks	Dmitriy Zaporozhets	2014-11-07	1	-0/+3
\|\ \ \| \| \| \| \| \|	Add custom hook support to CHANGELOG
\| * \|	Add custom hook support to CHANGELOG	Drew Blessing	2014-11-07	1	-0/+3
\|/ /
* \|	Merge pull request #190 from dblessing/feature/custom_hooks	Dmitriy Zaporozhets	2014-11-07	6	-8/+99
\|\ \ \| \|/ \|/\|	Custom hooks
\| *	Fix the calls to pre- and post-receive custom hooks	jkbzh	2014-11-06	1	-14/+41
\| \| \| \| \| \| \| \| \| \| \| \|	- Reset G_ID if the custom pre-receive hook fails - Use a pipe to feed stdin to the custom pre- and post-receive hooks, in the same way that the standalone git works
\| *	Support for custom hooks	Drew Blessing	2014-11-05	6	-8/+72
\|/
*	Merge pull request #192 from jkbzh/master	Dmitriy Zaporozhets	2014-10-31	1	-1/+1
\|\ \| \| \| \|	fixing broken custom pre-receive calls
\| *	using true instead of 1	jose	2014-10-30	1	-1/+1
\| \|
\| *	The gitlab pre-receive hook expects the call to exec to return 1	jose	2014-10-30	1	-1/+1
\|/ \| \| \| \| \| \| \| \|	when a user has access. Doing an exit 0 effectively ended the thread. No code would be executed after the call to exec. This changes fixes the problem for the pre-receive hooks but you want to check that GitlabAccess.exec is not used elsewhere. A quick grep of the code seems to indicate this is not the case
*	Merge pull request #90 from Razer6/optional_repo_path	Dmitriy Zaporozhets	2014-10-28	1	-3/+8
\|\ \| \| \| \|	Add optional repo path, remove reference to gitolite repo
\| *	Add optional repo path, remove reference to gitolite repo, fixes #77	Robert Schilling	2013-09-13	1	-3/+8
\| \|
* \|	Merge pull request #81 from corny/patch-1	Dmitriy Zaporozhets	2014-10-28	1	-3/+1
\|\ \ \| \| \| \| \| \|	avoid @user_tried
\| * \|	Update gitlab_shell.rb	Julian K.	2013-08-07	1	-3/+1
\| \| \| \| \| \| \| \| \|	using instance_variable_defined to avoid @user_tried
* \| \|	Merge pull request #177 from feedhenry/keys_list	Dmitriy Zaporozhets	2014-10-28	4	-0/+34
\|\ \ \ \| \| \| \| \| \| \| \|	Added list-keys command, with associated spec
\| * \| \|	Added list-keys command and spec	David Martin	2014-10-15	4	-0/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed puts and tidied up regex Address the hound Address the hound, again Use single quotes Add back travis.yml file Remove travis.yml, only keep on fh-master Use single quotes Use single quotes
* \| \| \|	Merge pull request #179 from feedhenry/projects_list	Dmitriy Zaporozhets	2014-10-28	4	-1/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Added list-projects command & spec
\| * \| \| \|	Added list-projects command & spec	David Martin	2014-10-15	4	-1/+31
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	list-projects command usage Single quotes Use single quotes Use single quotes
* \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlab-shellv2.1.0	Dmitriy Zaporozhets	2014-10-20	2	-1/+4
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: .gitignore
\| * \| \|	Merge pull request #184 from cirosantilli/ignore-bundle	Robert Schilling	2014-10-04	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Ignore .bundle
\| \| * \| \|	Ignore .bundle	Ciro Santilli	2014-10-04	1	-0/+1
\| \|/ / /
\| * \| \|	Merge pull request #182 from cirosantilli/split-instance-var-defs	Robert Schilling	2014-10-04	1	-1/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Split one instance variable per line
\| \| * \| \|	Split one instance variable per line	Ciro Santilli	2014-10-04	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Merge pull request #183 from cirosantilli/ignore-tags	Robert Schilling	2014-10-04	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Ignore tags file
\| \| * \| \| \|	Ignore tags file	Ciro Santilli	2014-10-04	1	-0/+1
\| \| \|/ / /
* \| \| \| \|	Modify changelog	Dmitriy Zaporozhets	2014-10-20	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Fix indentation	Dmitriy Zaporozhets	2014-10-20	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'secret_token' into 'master'	Dmitriy Zaporozhets	2014-10-20	11	-9/+38
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Secret token Part of gitlab/gitlabhq#1528. Required by gitlab/gitlabhq!1185 See merge request !46
\| * \| \| \|	Bump to minor version	Dmitriy Zaporozhets	2014-10-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	add secret token	Valery Sizov	2014-10-15	11	-9/+38
\|/ / / /