summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Fix indentationDmitriy Zaporozhets2014-10-202-5/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'secret_token' into 'master'Dmitriy Zaporozhets2014-10-2011-9/+38
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Secret token Part of gitlab/gitlabhq#1528. Required by gitlab/gitlabhq!1185 See merge request !46
| * | | | Bump to minor versionDmitriy Zaporozhets2014-10-161-1/+1
| | | | |
| * | | | add secret tokenValery Sizov2014-10-1511-9/+38
|/ / / /
* | | | Bump coveralls gemDmitriy Zaporozhets2014-09-301-11/+17
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add coveralls support properlyDmitriy Zaporozhets2014-09-302-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #172 from bbodenmiller/patch-1Dmitriy Zaporozhets2014-09-261-0/+1
|\ \ \ \ | |/ / / |/| | | add note about other HTTPS setup details
| * | | add note about other HTTPS setup detailsBen Bodenmiller2014-08-231-0/+1
| | | |
* | | | Fix testsDmitriy Zaporozhets2014-09-251-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix bug when changes to post-receive worker was not dumped properlyv2.0.1Dmitriy Zaporozhets2014-09-253-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Version 2.0.0v2.0.0Marin Jankovski2014-09-171-1/+1
| | | |
* | | | Merge branch 'master' of https://github.com/gitlabhq/gitlab-shellMarin Jankovski2014-09-171-0/+3
|\ \ \ \
| * \ \ \ Merge pull request #178 from Razer6/hound_single_quoteRobert Schilling2014-09-171-0/+3
| |\ \ \ \ | | | | | | | | | | | | Let hound prefer single-quote strings
| | * | | | Let hound prefer single-quote stringsRobert Schilling2014-09-161-0/+3
| |/ / / /
* | | | | Merge branch 'symlink_hooks_directory' into 'master'Dmitriy Zaporozhets2014-09-162-4/+7
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | Symlink hooks directory See merge request !44
| * | | | Add '.old' when renaming existing hooks directoryJacob Vosmaer2014-09-161-1/+1
| | | | |
| * | | | Symlink the whole hooks directoryJacob Vosmaer2014-09-162-4/+7
|/ / / /
* | | | Merge branch 'redis-sockets' into 'master'Dmitriy Zaporozhets2014-09-163-21/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Connect to Redis via sockets by default See merge request !41
| * | | | Improve gitlab config testsDmitriy Zaporozhets2014-09-161-5/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve config specs so they dont rely on config.ymlDmitriy Zaporozhets2014-09-161-13/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Connect to Redis via sockets by defaultJacob Vosmaer2014-09-162-3/+4
|/ / / /
* | | | Merge branch 'defaults' into 'master'Dmitriy Zaporozhets2014-09-122-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Redis defaults See merge request !42
| * | | | Git remote remove only available in git > 1.7.12Dmitriy Zaporozhets2014-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make sure user got redis defaults if not setDmitriy Zaporozhets2014-09-121-0/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #174 from UniIsland/redis-custom-databaseDmitriy Zaporozhets2014-09-123-3/+6
|\ \ \ \ | | | | | | | | | | support using custom redis database, fixes #173
| * | | | support using custom redis database, fixes #173Tao2014-09-133-3/+6
|/ / / /
* | | | Merge pull request #91 from raphendyr/patch-1Dmitriy Zaporozhets2014-09-111-2/+6
|\ \ \ \ | | | | | | | | | | Replace build in home folder with environment
| * | | | Replace build in home folder with environmentJaakko Kantojärvi2013-09-131-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | You can't ever assume that user's home is /home/$USERNAME or /home/git Preferable is to assume that user running gitlab-shell has repositories in his home (get from the environment).
* | | | Merge pull request #161 from Aigeruth/fix/gitlab_config_specDmitriy Zaporozhets2014-09-111-2/+4
|\ \ \ \ | | | | | | | | | | Fix spec for GitlabConfig.gitlab_url.
| * | | | Fix spec for GitlabConfig.gitlab_url.Gabor Nagy2014-07-061-2/+4
| | | | |
* | | | | Merge pull request #175 from yglukhov/security-issueDmitriy Zaporozhets2014-09-111-2/+20
|\ \ \ \ \ | | | | | | | | | | | | Security issue: imported URLs are stored along with password.
| * | | | | Security issue: imported URLs are stored along with password.uran2014-08-281-2/+20
| | | | | |
* | | | | | Merge pull request #141 from attiks/support-redis-passwordDmitriy Zaporozhets2014-09-112-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | added support for redis password
| * | | | | | added support for redis passwordPeter2014-03-212-1/+6
| | | | | | |
* | | | | | | Delete .travis.ymlDmitriy Zaporozhets2014-09-091-13/+0
| | | | | | |
* | | | | | | Replace travis with semaphoreappDmitriy Zaporozhets2014-09-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'rescue_enoent' into 'master'Dmitriy Zaporozhets2014-09-092-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore missing repositories in create-hooks When bin/create-hooks is run against a live GitLab server, there is a possibility of race conditions when a user deletes one of their repositories after bin/create-hooks found it. With this change, bin/create-hooks will ignore missing file errors. See merge request !40
| * | | | | | | Ignore missing repositories in create-hooksJacob Vosmaer2014-09-092-1/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When bin/create-hooks is run against a live GitLab server, there is a possibility of race conditions when a user deletes one of their repositories after bin/create-hooks found it. With this change, bin/create-hooks will ignore missing file errors.
* | | | | | | Rebuild vcr cassettesDmitriy Zaporozhets2014-09-037-45/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'post-api' into 'master'Dmitriy Zaporozhets2014-09-032-5/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make gitlab-shell work with new /api/allowed method See merge request !39
| * | | | | | | GitLab /api/allowed endpoint requires POST requestDmitriy Zaporozhets2014-09-032-5/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit made changes to GitLab shell to work with huge pushed (ex. 1k branhes) using POST request to API Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'hooks-refactoring' into 'master'Dmitriy Zaporozhets2014-09-0222-147/+191
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hooks refactoring * replace update hook with pre-receive & post-receive hooks * use pre-receive hook for authorisation * use post-receive hook to create background job for GitLab worker Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/1516 See merge request !38
| * | | | | | | Update GitlabNet to match new logicDmitriy Zaporozhets2014-09-019-54/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Version 2.0.0.pre. Requires GitLab 7.3+Dmitriy Zaporozhets2014-09-012-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Remove update hook logicDmitriy Zaporozhets2014-09-015-98/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add tests for GitlabPostReceiveDmitriy Zaporozhets2014-09-012-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | GitlabAccess and GitlabPostReceive classes addedDmitriy Zaporozhets2014-09-014-3/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab Access handles security check. GitlabPostReceive creates a sidekiq job Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Add new pre-receive and post-receive hooksDmitriy Zaporozhets2014-09-012-0/+34
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlab-shellDmitriy Zaporozhets2014-08-291-1/+1
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #164 from liammonahan/masterJeroen van Baarsen2014-08-151-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Match .log* instead of .log.* in .gitignore