summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge branch 'abort-check-path' into 'master'Jacob Vosmaer2014-08-272-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abort check path Fixes #13 See merge request !35
| * | | | | | use abort isntead of raise when checking pathJob van der Voort2014-08-272-2/+2
|/ / / / / /
* | | | | | Version 1.9.7v1.9.7Dmitriy Zaporozhets2014-08-132-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-08-131-29/+23
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #169 from cirosantilli/md-styleJeroen van Baarsen2014-08-111-29/+23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Update README Markdown style to match CONTRIBUTING
| | * | | | | Update README Markdown style to match CONTRIBUTINGCiro Santilli2014-08-111-29/+23
| |/ / / / /
* | | | | | Merge branch 'fix-repo-path' into 'master'Dmitriy Zaporozhets2014-08-135-12/+65
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fix repository name/path extraction for GitlabUpdate See merge request !34
| * | | | | Fix invalid repo_name/repo_path parsing by GitlabUpdateDmitriy Zaporozhets2014-08-135-12/+65
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #162 from asedge/annotated_tagsDmitriy Zaporozhets2014-07-153-9/+37
|\ \ \ \ \ | |_|/ / / |/| | | | Adding support+tests for annotated tags.
| * | | | Need to set config for user.name and user.email before creating the ↵Sean Edge2014-07-121-2/+2
| | | | | | | | | | | | | | | | | | | | annotated tag.
| * | | | Hopefully fixing broken CI build by setting user.name and user.email on the ↵Sean Edge2014-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | temporary repo.
| * | | | Adding support+tests for annotated tags.Sean Edge2014-07-093-9/+34
|/ / / /
* | | | Update CHANGELOGDmitriy Zaporozhets2014-07-051-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix testsDmitriy Zaporozhets2014-07-041-2/+2
| | | |
* | | | Merge pull request #159 from Aigeruth/improvement/simplecovDmitriy Zaporozhets2014-07-041-0/+3
|\ \ \ \ | | | | | | | | | | Use simplecov for development.
| * | | | Use simplecov for development.Gabor Nagy2014-06-241-0/+3
| | | | |
* | | | | Merge pull request #155 from ssandler/masterDmitriy Zaporozhets2014-07-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | GitlabUpdate: use stripped path for repo_name
| * | | | | GitlabUpdate: use stripped path for repo_nameScott Sandler2014-06-161-1/+1
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-07-048-16/+265
|\ \ \ \ \
| * \ \ \ \ Merge pull request #158 from Aigeruth/improvement/coverageDmitriy Zaporozhets2014-07-048-16/+265
| |\ \ \ \ \ | | |/ / / / | |/| | | | Improve coverage.
| | * | | | Improve coverage.Gabor Nagy2014-06-238-16/+265
| |/ / / /
* | | | | Merge branch 'working_gitlab_url' into 'master'Dmitriy Zaporozhets2014-07-041-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 exceptionJacob Vosmaer2014-06-201-1/+2
| | | | |
| * | | | Use a default for gitlab_url that usually worksJacob Vosmaer2014-06-201-1/+4
|/ / / /
* | | | Bump versionv1.9.6Dmitriy Zaporozhets2014-06-101-1/+1
| | | |
* | | | Merge branch 'require_timeout' into 'master'Dmitriy Zaporozhets2014-06-102-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | Expliclity require 'timeout' from the stdlib
| * | | | Expliclity require 'timeout' from the stdlibJacob Vosmaer2014-06-102-0/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | This avoids getting the following error on some platforms: NameError: uninitialized constant GitlabKeys::Timeout
* | | | Version 1.9.5v1.9.5Dmitriy Zaporozhets2014-05-311-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'add-key-lock' into 'master'Dmitriy Zaporozhets2014-05-313-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use lock file when add new entries to authorized_keys Fixes #21
| * | | | Create keys fixtures in testDmitriy Zaporozhets2014-05-311-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use authorized_keys lock when add new key to fileDmitriy Zaporozhets2014-05-312-3/+6
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'lock_file_location' into 'master'Dmitriy Zaporozhets2014-05-313-2/+16
|\ \ \ \ | | | | | | | | | | | | | | | Lock file location
| * | | | Put authorized_keys.lock in the .ssh directoryJacob Vosmaer2014-05-303-2/+16
|/ / / /
* | | | Version 1.9.4v1.9.4Dmitriy Zaporozhets2014-04-241-1/+1
| | | |
* | | | Merge branch 'authorized_keys_lock' into 'master'Dmitriy Zaporozhets2014-04-224-14/+74
|\ \ \ \ | | | | | | | | | | | | | | | Authorized keys lock
| * | | | Mention lock file in changelogDmitriy Zaporozhets2014-04-181-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Use lock file when add or remove keys from authorized_keys fileDmitriy Zaporozhets2014-04-183-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 Zaporozhets2014-04-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Fix spec failure in Ruby 1.9.3
| * | | | Invoke IO.popen correctly for Ruby 1.9.3Jacob Vosmaer2014-04-151-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 readmeDmitriy Zaporozhets2014-04-141-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Inline badgesDmitriy Zaporozhets2014-04-141-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix testsDmitriy Zaporozhets2014-04-148-126/+66
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #145 from lsjostro/fix_envJacob Vosmaer2014-04-111-1/+1
|\ \ \ \ | | | | | | | | | | Preserve LD_LIBRARY_PATH for Kernel::exec
| * | | | set LD_LIBRARY_PATH for Kernel::execLars Sjöström2014-03-261-1/+1
| |/ / /
* | | | 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