summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Version 1.9.3v1.9.3Dmitriy Zaporozhets2014-04-032-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix fatal: bad object 0000 when do new branch pushDmitriy Zaporozhets2014-04-031-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Version 1.9.2v1.9.2Dmitriy Zaporozhets2014-04-032-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Make force push detection actually workDmitriy Zaporozhets2014-04-032-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #128 from ↵Dmitriy Zaporozhets2014-04-032-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 updatesSteven Thonus2014-03-252-2/+7
|/ / / | | | | | | | | | rebased for new code
* | | Version 1.9.1v1.9.1Dmitriy Zaporozhets2014-03-202-1/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Pass tag name to update hook tooDmitriy Zaporozhets2014-03-201-6/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Version 1.9.0v1.9.0Dmitriy Zaporozhets2014-03-202-1/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'improve-git-update' into 'master'Dmitriy Zaporozhets2014-03-202-21/+23
|\ \ \ | | | | | | | | | | | | Improve Git Update
| * | | Fix testsDmitriy Zaporozhets2014-03-191-2/+3
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Send api.allowed? request for both http and ssh pushDmitriy Zaporozhets2014-03-192-21/+22
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | version 1.8.5v1.8.5Dmitriy Zaporozhets2014-03-151-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix_changelog' into 'master'Dmitriy Zaporozhets2014-03-151-1/+3
|\ \ \ | | | | | | | | | | | | Fix Changelog
| * | | Move batch-add-keys under the right versionJacob Vosmaer2014-03-141-1/+3
|/ / /
* | | Merge branch 'batch_key_import' into 'master'Dmitriy Zaporozhets2014-03-144-2/+69
|\ \ \ | | | | | | | | | | | | Batch Key Import
| * | | Add gitlab-keys batch-add-keysJacob Vosmaer2014-03-144-1/+64
| | | | | | | | | | | | | | | | | | | | This command is intended to be called by the GitLab Rails code when restoring an application backup.
| * | | Generate key_line in separate methodJacob Vosmaer2014-03-141-1/+5
|/ / /
* | | Version 1.8.4v1.8.4Dmitriy Zaporozhets2014-03-132-1/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add process wait for importDmitriy Zaporozhets2014-03-131-1/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Dont import repo if existsDmitriy Zaporozhets2014-03-132-0/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'import-timeout' into 'master'v1.8.3Dmitriy Zaporozhets2014-03-125-11/+57
|\ \ \ | | | | | | | | | | | | Import Timeout
| * | | Use KILL instead of TERMDmitriy Zaporozhets2014-03-121-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use large repo instead one with promptDmitriy Zaporozhets2014-03-121-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | change seed repoDmitriy Zaporozhets2014-03-121-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use Process spawnDmitriy Zaporozhets2014-03-121-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Changelog entry and new versionDmitriy Zaporozhets2014-03-122-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add support for import repo timeoutDmitriy Zaporozhets2014-03-123-10/+50
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'exec_warning' into 'master'Dmitriy Zaporozhets2014-03-121-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | Explain why GitlabShell#exec_cmd has no tests
| * | | Explain why GitlabShell#exec_cmd has no testsJacob Vosmaer2014-03-121-0/+1
| | | |
* | | | Version 1.8.2v1.8.2Dmitriy Zaporozhets2014-03-122-1/+4
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix typo in Kernel::exec optionsJacob Vosmaer2014-03-121-1/+1
| | |
* | | Version 1.8.1v1.8.1Dmitriy Zaporozhets2014-03-112-1/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'environment_variables' into 'master'Dmitriy Zaporozhets2014-03-111-2/+2
|\ \ \ | | | | | | | | | | | | Restrict Environment Variables
| * | | Restrict env variables passed to git-xxx-packJacob Vosmaer2014-03-071-2/+2
| | | |
* | | | Merge branch 'shell_style' into 'master'Dmitriy Zaporozhets2014-03-113-20/+24
|\ \ \ \ | |/ / / |/| | | | | | | Shell Style
| * | | Use safer shell invocations in bin/installJacob Vosmaer2014-03-071-9/+9
| | | |
| * | | Use less shell commands in gitlab_projects_spec.rbJacob Vosmaer2014-03-071-2/+2
| | | |
| * | | Use IO.popen instead of Kernel#` to read refsJacob Vosmaer2014-03-071-8/+12
| | | |
| * | | Use built-in Ruby Dir.pwd instead of the shellJacob Vosmaer2014-03-071-1/+1
|/ / /
* | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-02-260-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: support/rewrite-hooks.sh
| * \ \ Merge pull request #93 from raphendyr/patch-3Dmitriy Zaporozhets2014-02-031-14/+8
| |\ \ \ | | | | | | | | | | Remove hard coded home
| | * | | Remove hard coded homeJaakko Kantojärvi2013-09-131-14/+8
| | |/ / | | | | | | | | Also wrote shell script in shell...
* | | | Merge branch 'create_hooks' into 'master'Dmitriy Zaporozhets2014-02-264-37/+26
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Add bin/create-hooks command for backup restores This solves the problem that `support/rewrite-hooks.sh` assumes that the gitlab-shell is installed in `/home/git/gitlab-shell`, which does not hold for omnibus-gitlab.
| * | | Make support/rewrite-hooks.sh use bin/create_hooksJacob Vosmaer2014-02-262-26/+15
| | | |
| * | | Make GitlabProjects#create_hooks a class methodJacob Vosmaer2014-02-262-11/+11
|/ / /
* | | Merge branch 'better-description' of /home/git/repositories/gitlab/gitlab-shellDmitriy Zaporozhets2013-12-041-0/+2
|\ \ \
| * | | Some people thought we made a special shell.Sytse Sijbrandij2013-11-291-0/+2
|/ / /
* | | Version 1.8.0v1.8.0Dmitriy Zaporozhets2013-11-252-1/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'gitlab_keys_return_values' of ↵Dmitriy Zaporozhets2013-11-252-24/+52
|\ \ \ | | | | | | | | | | | | /home/git/repositories/gitlab/gitlab-shell