summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ /
* | Merge branch 'remove-branch-functionality' into 'master' Rémy Coutable2016-04-194-57/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove branch functionality The branch functionality is already replaced with rugged inside GitLab See merge request !52
| * | Remove branch functionalityRobert Schilling2016-04-194-57/+1
|/ /
* | Merge branch 'remove-rm-tags' into 'master' Rémy Coutable2016-04-184-30/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove rm-tag command Not needed anymore because gitlab-org/gitlab-ce!3748 switched the functionality to rugged. See merge request !54
| * | Remove rm-tag commandRobert Schilling2016-04-184-30/+1
|/ /
* | Merge branch 'remove-list-remote-tags' into 'master' Rémy Coutable2016-04-182-22/+4
|\ \ | | | | | | | | | | | | | | | | | | Remove unused #list_remote_tags This function is not used anymore inside GitLab. See merge request !53
| * | Remove unused #list_remote_tagsRobert Schilling2016-04-162-22/+4
|/ /
* | Bumped version to 2.7.2v2.7.2Yorick Peterse2016-04-071-1/+1
| |
* | Merge branch 'gc-prune-after-all' into 'master' Yorick Peterse2016-04-061-1/+1
|\ \ | | | | | | | | | | | | Prune during 'git gc' after all See merge request !48
| * | Revert "Do not prune objects during 'git gc'"Jacob Vosmaer2016-04-061-1/+1
|/ / | | | | | | | | | | | | This reverts commit 1ca8a44f0baa1728650308fe992f42660170ae16. Never pruning loose objects at all is not really a solution for anything, and it causes annoying `git gc --auto` warnings.
* | Merge branch 'issue_39' into 'master' v2.7.1Douwe Maan2016-03-313-2/+28
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new command to list tags from a remote repo. The output of the `git ls-remote` command is written to the STDOUT so the client can read and parse the list of tags. If there is an error it's also written to STDOUT. Closes #39 See merge request !47
| * | Bump VERSION and update CHANGELOG.Rubén Dávila2016-03-312-1/+4
| | |
| * | Add new command to list tags from a remote repo.Rubén Dávila2016-03-311-1/+24
|/ / | | | | | | | | | | The output of the `git ls-remote` command is written to the STDOUT so the client can read and parse the list of tags. If there is an error it's also written to STDOUT.
* | Corrected version in CHANGELOG of latest releaseYorick Peterse2016-03-311-1/+1
| | | | | | | | [ci skip]
* | Merge branch 'gl_ee_issue_116' into 'master' Douwe Maan2016-03-311-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to fetch remote repo without tags. When fetching remote repo with tags the new remote tags are mixed in with the local tags (all tags are saved under refs/tags), this affects the UI of the Project given that we're showing up tags of a remote repo. REF: https://gitlab.com/gitlab-org/gitlab-ee/issues/116 See merge request !46
| * | Add the ability to fetch remote repo without tags.gl_ee_issue_116Rubén Dávila2016-03-301-2/+6
|/ / | | | | | | | | | | When fetching remote repo with tags the new remote tags are mixed in with the local tags (all tags are saved under refs/tags), this affects the UI of the Project given that we're showing up tags of a remote repo.
* | Bumped version to 2.7.0v2.7.0Yorick Peterse2016-03-291-1/+1
| |
* | Merge branch 'use-ssh-key-internal-api' into 'master' Yorick Peterse2016-03-2910-15/+224
|\ \ | | | | | | | | | | | | Use ssh key internal api to build the authorized-keys command on openssh 6.9 See merge request !42
| * | Invert clause when checking key for clarityuse-ssh-key-internal-apiPablo Carranza2016-03-241-3/+3
| | |
| * | Add empty key checkPablo Carranza2016-03-241-2/+2
| | |
| * | Add changelog and bumped versionPablo Carranza2016-03-242-1/+4
| | |
| * | Change the key format when generating the authorized key to match the legacy onePablo Carranza2016-03-241-1/+1
| | |
| * | Add encoding for the ssh key on the urlPablo Carranza2016-03-243-3/+5
| | |
View Lorry Controller Status