Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | If git-annex is enabled set GIT_ANNEX_SHELL_LIMITED variable.git_annex_env_variable | Marin Jankovski | 2015-07-16 | 1 | -1/+11 |
| | |||||
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell | Marin Jankovski | 2015-07-16 | 3 | -3/+30 |
|\ | |||||
| * | Merge branch 'yml-script' into 'master' | Dmitriy Zaporozhets | 2015-07-01 | 1 | -0/+22 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitlab-ci yml script Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @vsizov See merge request !14 | ||||
| | * | Add gitlab-ci yml script | Dmitriy Zaporozhets | 2015-07-01 | 1 | -0/+22 |
| |/ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Make link to CI https | Sytse Sijbrandij | 2015-06-15 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'note_in_config' into 'master' | Dmitriy Zaporozhets | 2015-06-11 | 1 | -0/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note that changing example configuration files requires changing omnibus-gitlab. Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab. Added a note so everyone is aware of this. Similar is added to gitlab-ce and gitlab-ci. Discussed in gitlab-org/omnibus-gitlab#605 See merge request !13 | ||||
| | * | Add a note that changing example configuration files requires changing ↵note_in_config | Marin Jankovski | 2015-06-11 | 1 | -0/+5 |
| |/ | | | | | | | omnibus-gitlab. | ||||
* | | Merge pull request #230 from bozaro/git-lfs-authenticate | Dmitriy Zaporozhets | 2015-07-06 | 2 | -3/+45 |
|\ \ | |/ |/| | Add git-lfs-authenticate to command white list | ||||
| * | Add Git LFS remark to README.md | Artem V. Navrotskiy | 2015-07-03 | 1 | -0/+29 |
| | | |||||
| * | Add git-lfs-authenticate to command white list | Artem V. Navrotskiy | 2015-06-29 | 1 | -3/+16 |
|/ | |||||
* | Merge branch 'safe-rm-key' into 'master'v2.6.3 | Dmitriy Zaporozhets | 2015-04-14 | 3 | -3/+10 |
|\ | | | | | | | | | | | | | | | Prevent keys with a very specific comment from accidentally being deleted. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/32. See merge request !11 | ||||
| * | Prevent keys with a very specific comment from accidentally being deleted. | Douwe Maan | 2015-04-14 | 3 | -3/+10 |
|/ | |||||
* | Add changelog entry about GL_IDv2.6.2 | Dmitriy Zaporozhets | 2015-04-13 | 1 | -0/+1 |
| | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | Merge branch 'list-ecdsa' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 3 | -2/+5 |
|\ | | | | | | | | | | | | | | | Include ecdsa keys in `gitlab_keys list-keys`. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/31. See merge request !12 | ||||
| * | Include ecdsa keys in `gitlab_keys list-keys`.list-ecdsa | Douwe Maan | 2015-04-10 | 3 | -2/+5 |
| | | |||||
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell | Dmitriy Zaporozhets | 2015-04-13 | 7 | -58/+47 |
|\ \ | |||||
| * \ | Merge branch 'gl-id-refactor' into 'master' | Dmitriy Zaporozhets | 2015-04-13 | 7 | -58/+47 |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | Refactor logic around GL_ID. Builds upon !8. See merge request !9 | ||||
| | * | Update GitlabShell tests.gl-id-refactor | Douwe Maan | 2015-04-06 | 1 | -25/+22 |
| | | | |||||
| | * | Refactor GitlabShell#exec a bit. | Douwe Maan | 2015-04-06 | 1 | -7/+9 |
| | | | |||||
| | * | GitlabShell doesn't need to set GL_ID at all. | Douwe Maan | 2015-04-06 | 2 | -6/+8 |
| | | | |||||
| | * | Move setting/unsetting of GL_ID from lib to executables. | Douwe Maan | 2015-04-06 | 4 | -20/+8 |
| | | | |||||
* | | | Merge pull request #212 from jirutka/patch-1 | Dmitriy Zaporozhets | 2015-04-10 | 3 | -1/+9 |
|\ \ \ | |/ / |/| | | Allow to configure location of the secret file | ||||
| * | | Allow to configure location of the secret file | Jakub Jirutka | 2015-02-08 | 3 | -1/+9 |
| | | | |||||
* | | | Version 2.6.1v2.6.1 | Dmitriy Zaporozhets | 2015-04-09 | 2 | -1/+4 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'nice-error-message' into 'master' | Dmitriy Zaporozhets | 2015-04-09 | 5 | -32/+49 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | Write errors to stderr to get git to abort and show them as such. Addresses private issues https://dev.gitlab.org/gitlab/gitlab-shell/issues/33 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2195. ![Screen_Shot_2015-04-06_at_13.05.43](https://gitlab.com/gitlab-org/gitlab-shell/uploads/56a4b9f4cc983da93afeb2b85252ec7e/Screen_Shot_2015-04-06_at_13.05.43.png) See merge request !8 | ||||
| * | | Write GitlabShell error to stderr.nice-error-message | Douwe Maan | 2015-04-06 | 3 | -21/+36 |
| | | | |||||
| * | | Write GitlabAccess error to stderr. | Douwe Maan | 2015-04-06 | 2 | -11/+13 |
|/ / | |||||
* | | Change 2.5.5 to 2.6.0 because of incompatible changesv2.6.0 | Dmitriy Zaporozhets | 2015-03-16 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'post-receive-base64' into 'master' | Dmitriy Zaporozhets | 2015-03-16 | 4 | -5/+14 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent character encoding issues by sending received changes as raw data. Better alternative to !64 that doesn't require new gems and leaves dealing with string character encoding to gitlab-rails. See gitlab/gitlabhq!1701 for the corresponding changes there. Fixes: - https://github.com/gitlabhq/gitlabhq/issues/7486 - https://gitlab.com/gitlab-org/gitlab-ce/issues/858 - https://gitlab.com/gitlab-org/gitlab-ce/issues/877 - https://gitlab.com/gitlab-org/gitlab-ce/issues/965 See merge request !65 | ||||
| * | | Prevent character encoding issues by sending received changes as raw data. | Douwe Maan | 2015-03-15 | 4 | -5/+14 |
|/ / | |||||
* | | Stub repo path for tests | Dmitriy Zaporozhets | 2015-03-04 | 1 | -0/+1 |
| | | |||||
* | | Fix post-receive broadcast message | Dmitriy Zaporozhets | 2015-03-04 | 1 | -1/+1 |
| | | |||||
* | | Enable rubocop rule | Dmitriy Zaporozhets | 2015-03-02 | 3 | -4/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlab-shell | Dmitriy Zaporozhets | 2015-03-02 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #214 from p8/master | Robert Schilling | 2015-02-27 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Correct spelling: Symlinking is short for symbolic linking | ||||
| | * | | Correct spelling: Symlinking is short for symbolic linking | Petrik de Heus | 2015-02-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'no-recursive-install' into 'master' | Valery Sizov | 2015-02-26 | 2 | -2/+4 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove recursive commands from bin/install It is not clear what we need these for anymore. Because these commands would recurse once through all existing files in all Git repositories, and then another time through all directories these commands could take very long on a server with a lot of repositories. We keep the 'chmod' on config.repos_path, to deny world access to all files and directories beneath it. See merge request !63 | ||||
| * | | Remove recursive commands from bin/install | Jacob Vosmaer | 2015-02-26 | 2 | -2/+4 |
|/ / | | | | | | | | | | | | | | | | | | | It is not clear what we need these for anymore. Because these commands would recurse once through all existing files in all Git repositories, and then another time through all directories these commands could take very long on a server with a lot of repositories. We keep the 'chmod' on config.repos_path, to deny world access to all files and directories beneath it. | ||||
* | | gitlab-shell version 2.5.4.v2.5.4 | Marin Jankovski | 2015-02-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fix-post-receive' into 'master' | Marin Jankovski | 2015-02-24 | 4 | -19/+90 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | Return true from GitlabPostReceive to ensure custom hooks run. Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/438. See merge request !62 | ||||
| * | | Fix tests | Dmitriy Zaporozhets | 2015-02-23 | 2 | -11/+11 |
| | | | |||||
| * | | Add tests. | Douwe Maan | 2015-02-23 | 2 | -9/+78 |
| | | | |||||
| * | | Return true from GitlabPostReceive to ensure custom hooks run. | Douwe Maan | 2015-02-23 | 1 | -1/+3 |
|/ / | |||||
* | | Merge branch 'better-readme' into 'master' | Dmitriy Zaporozhets | 2015-02-21 | 1 | -5/+58 |
|\ \ | | | | | | | | | | | | | | | | Update readme after Saturday morning conversation with Dmitriy. See merge request !61 | ||||
| * | | Make key authorization easier to understand. | Sytse Sijbrandij | 2015-02-21 | 1 | -3/+2 |
| | | | |||||
| * | | Better title and description. | Sytse Sijbrandij | 2015-02-21 | 1 | -1/+3 |
| | | | |||||
| * | | Update readme after Saturday morning conversation with Dmitriy. | Sytse Sijbrandij | 2015-02-21 | 1 | -5/+57 |
|/ / | |||||
* | | Add note about centos for git-annex. | Marin Jankovski | 2015-02-20 | 1 | -0/+1 |
| | | |||||
* | | Add a comment about gitlab-shell. | Marin Jankovski | 2015-02-20 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'less_if_nesting' into 'master' | Dmitriy Zaporozhets | 2015-02-20 | 1 | -34/+28 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Less if-else nesting in gitlab_shell.rb This intention of this change is to make the normal flow of execution easier to read, and to prevent mistakes in deeply nested if-else trees. See merge request !60 |