summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Allow gitlab-project's fork-project command to fork projects between ↵51-gitlab-project-s-fork_project-command-doesn-t-work-if-the-project-is-being-forked-to-another-storageAlejandro Rodríguez2016-07-263-8/+45
| | | | different repository storages
* Merge branch 'remove-env-set' into 'master' Robert Speicher2016-07-213-10/+4
|\ | | | | | | | | | | | | | | | | Unset GL_ID and GL_PROTOCOL immediately Neither other code executing in the hook process nor subprocesses of the hook process need access to the GL_ID / GL_PROTOCOL variables so we can just unset them the moment we fetch them. See merge request !73
| * Remove spaceremove-env-setJacob Vosmaer2016-07-201-1/+1
| |
| * More ENV.deleteJacob Vosmaer2016-07-201-1/+1
| |
| * Unset GL_ID and GL_PROTOCOL immediatelyJacob Vosmaer2016-07-202-9/+3
|/ | | | | | Neither other code executing in the hook process nor subprocesses of the hook process need access to the GL_ID / GL_PROTOCOL variables so we can just unset them the moment we fetch them.
* Merge branch '48-regression-in-v3-1-0-vs-v3-0-0' into 'master' v3.2.0Stan Hu2016-07-062-0/+2
|\ | | | | | | | | | | | | Add an error message when using shell commands with incompatible GitLab versions Closes #48 See merge request !70
| * Add an error message when using shell commands with incompatible GitLab versionsAlejandro Rodríguez2016-07-062-0/+2
|/
* Merge branch 'add-allowed-protocols-support' into 'master' Douwe Maan2016-07-0611-17/+150
|\ | | | | | | | | | | | | Allow GitLab Shell to check for allowed access based on the used Git protocol. Needed for gitlab-org/gitlab-ce!4696 and gitlab-org/gitlab-ce#18601 See merge request !62
| * Bump VERSION to 3.2.0add-allowed-protocols-supportPatricio Cano2016-07-052-2/+4
| |
| * Make use of a constant for the used SSH protocolPatricio Cano2016-07-051-2/+3
| |
| * Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] and make it mandatory with no ↵Patricio Cano2016-07-055-11/+11
| | | | | | | | fallback value
| * Added better tests for the protocol checkPatricio Cano2016-07-054-1/+126
| |
| * Simplify protocol assign, and populate ENV['PROTOCOL'] variable when calling ↵Patricio Cano2016-07-053-5/+4
| | | | | | | | hooks via SSH
| * Added CHANGELOG itemPatricio Cano2016-07-051-0/+1
| |
| * Allow GitLab Shell to check for allowed access based on the used Git protocol.Patricio Cano2016-07-054-6/+11
|/
* Merge branch 'remove-hound-config' into 'master' Stan Hu2016-07-051-3/+0
|\ | | | | | | | | | | | | Remove hound config Since we moved to gitlab.com we don't use Hound CI anymore. Instead we have rubocop. See merge request !69
| * Remove hound configremove-hound-configRobert Schilling2016-07-051-3/+0
|/
* Merge branch 'user_stderr' into 'master' Stan Hu2016-07-051-3/+3
|\ | | | | | | | | | | | | | | | | Use STDERR to output error messages It's pretty minor change so I don't think we need a changelog item for this. Fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/47 See merge request !68
| * use STDERR to output error messagesValery Sizov2016-07-051-3/+3
|/
* Merge branch 'shards' into 'master' v3.1.0Yorick Peterse2016-06-3017-150/+172
|\ | | | | | | | | | | | | Implement shard paths handling See https://gitlab.com/gitlab-org/gitlab-ee/issues/583 See merge request !61
| * Refactor repository paths handling to allow multiple git mount pointsshardsAlejandro Rodríguez2016-06-2917-150/+172
|/
* Merge branch 'custom-hook-output' into 'master' Stan Hu2016-06-261-29/+16
|\ | | | | | | | | | | | | | | | | Prevent blocking custom hook output streams Based on https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/49 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1458 See merge request !67
| * Simplify custom hook output handlingcustom-hook-outputJacob Vosmaer2016-06-241-29/+16
|/
* Merge branch 'gitlab-redis' into 'master' Stan Hu2016-06-233-2/+3
|\ | | | | | | | | | | | | Put Redis loading code in one place Before this change you could not run the gitlab_net specs in isolation. See merge request !64
| * Put Redis loading code in one placegitlab-redisJacob Vosmaer2016-06-233-2/+3
| |
* | Merge branch 'no-argf' into 'master' Robert Speicher2016-06-232-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ARGF does more than we want ARGF is a virtual IO stream that treats the elements of ARGV as paths to files to be opened. In practice, git-receive-pack will probably never pass arguments to pre-receive and post-receive because it is not supposed to (according to 'man 5 githooks'). In case it does, however our hooks should not have the surprise behavior of treating those arguments as files to be opened. See merge request !66
| * | ARGF does more than we wantJacob Vosmaer2016-06-232-2/+2
|/ / | | | | | | | | | | | | | | | | ARGF is a virtual IO stream that treats the elements of ARGV as paths to files to be opened. In practice, git-receive-pack will probably never pass arguments to pre-receive and post-receive because it is not supposed to (according to 'man 5 githooks'). In case it does, however our hooks should not have the surprise behavior of treating those arguments as files to be opened.
* | Merge branch 'simplify-access-status' into 'master' Valery Sizov2016-06-233-9/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | Simplify the GitAccessStatus class Make the optional 'message' argument required. Remove unused 'to_json' method. See merge request !65
| * | Simplify the GitAccessStatus classsimplify-access-statusJacob Vosmaer2016-06-233-9/+8
| |/ | | | | | | | | Make the optional 'message' argument required. Remove unused 'to_json' method.
* | Merge branch 'enqueued_at_for_jobs' into 'master' Yorick Peterse2016-06-233-2/+12
|\ \ | |/ |/| | | | | Update PostReceive worker to provide enqueued_at time See merge request !63
| * Update PostReceive worker to provide enqueued_at timeenqueued_at_for_jobsPaco Guzman2016-06-233-2/+12
|/
* Version 3.0.0v3.0.0Jacob Vosmaer2016-05-231-1/+1
|
* Merge branch 'use-redis-rb-client' into 'master' Jacob Vosmaer (GitLab)2016-05-1625-79/+5391
|\ | | | | | | | | | | | | | | | | | | Use Redis Ruby client instead of shelling out to redis-cli Previously the post-receive hook fired redis-cli, but if the argument list was too long the hook would silently fail. Instead of shelling out to redis-cli, we use a Ruby client to send the same message. Closes gitlab-org/gitlab-ce#17329 See merge request !59
| * Put redis library in lib/vendor/ and adjust LOAD_PATHuse-redis-rb-clientStan Hu2016-05-1219-34/+26
| |
| * Remove unnecessary statement in MakefileStan Hu2016-05-121-1/+0
| |
| * Exclude vendor path in RubocopStan Hu2016-05-121-0/+1
| |
| * Add redis-rb as a vendored libraryStan Hu2016-05-1220-6/+5306
| | | | | | | | `make update-redis` will clone the library and adjust the paths properly
| * Test passwordStan Hu2016-05-121-0/+14
| |
| * Use Redis Ruby client instead of shelling out to redis-cliStan Hu2016-05-1210-79/+85
|/ | | | Closes gitlab-org/gitlab-ce#17329
* Merge branch 'remove-batch' into 'master' Rémy Coutable2016-05-101-1/+1
|\ | | | | | | | | | | | | Remove broken badge The state is shown on the repository anyway See merge request !39
| * Set the GL badgeZeger-Jan van de Weg2016-05-101-0/+1
| |
| * Remove broken badge remove-batchZeger-Jan van de Weg2016-02-191-1/+0
| | | | | | The state is shown on the repository anyway
* | Merge branch 'fix-spelling-mistakes' into 'master' Stan Hu2016-05-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix spelling mistakes in README.md See merge request !57
| * | Fix spelling mistakes in README.mdMark Campbell2016-05-051-2/+2
|/ /
* | Merge branch 'remove-update-head' into 'master' Jacob Vosmaer (GitLab)2016-04-285-50/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the update-head command since GitLab doesn't use it anymore It looks like we tend to remove commands that are not used by GitLab anymore (see gitlab-org/gitlab-shell!26) and the `update-head` command will soon be in that case (see https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3705), so I think we should remove it from here too. Note: I'm setting this as a WIP to ensure this doesn't get merged since the GitLab MR is not merged at that moment. See merge request !51
| * | Remove the update-head command since GitLab doesn't use it anymoreRémy Coutable2016-04-285-50/+1
|/ / | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'revert-53' into 'master' Rémy Coutable2016-04-282-1/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Remove unused #list_remote_tags" This reverts commit f5e87590d463b4b3d1bf5cd6b49a9d0d60acd552 because `#list_remote_tags` is still used by EE:https://gitlab.com/gitlab-org/gitlab-ee/blob/2c364a79ee110a3adf49d6bd30be985ed13c3ec5/lib/gitlab/backend/shell.rb#L45. /cc @razer6 See merge request !56
| * | Revert "Remove unused #list_remote_tags"revert-53Rémy Coutable2016-04-252-1/+22
|/ / | | | | | | | | | | This reverts commit f5e87590d463b4b3d1bf5cd6b49a9d0d60acd552. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'aiionx/gitlab-shell-aiionx-post_receive_jid' into 'master' Stan Hu2016-04-203-3/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update post receive worker so it logs a unique JID in sidekiq Taken from !50. Instead of ``` 2016-04-14T03:07:32.373Z 5285 TID-osycgmlyo PostReceive JID- INFO: start 2016-04-14T03:07:32.374Z 5285 TID-osycgmlyo PostReceive JID- INFO: arguments: [...] 2016-04-14T03:07:32.534Z 5285 TID-osycgmlyo PostReceive JID- INFO: done: 0.161 sec ``` Have this log ``` 2016-04-14T03:07:32.373Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: start 2016-04-14T03:07:32.374Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: arguments: [...] 2016-04-14T03:07:32.534Z 5285 TID-osycgmlyo PostReceive JID-54b0b2f6616cae37e3e87f8a INFO: done: 0.161 sec ``` This way sidekiq can Log a unique JID in the sidekiq.log for PostReceive. So when parsing the logs (with logstash for example) you know it belongs to that unique job. This puts the logs in a uniform manner like the other workers that are pushed to redis (which do have a JID) For example the ProjectWebHookWorker ``` 2016-04-14T03:13:07.917Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: start 2016-04-14T03:13:07.918Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: arguments: [...] 2016-04-14T03:13:12.500Z 5285 TID-osycsh7z0 ProjectWebHookWorker JID-800085fb3cf7241fdeecc6ec INFO: done: 4.583 sec ``` See merge request !55
| * | Update post receive worker so it logs a unique JID in sidekiqaiionx/gitlab-shell-aiionx-post_receive_jidaiionx2016-04-193-3/+9
|/ /
View Lorry Controller Status