summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-085-68/+134
|\
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-0848-382/+596
| |\
| * | Fix testsJacob Vosmaer2016-06-062-21/+21
| * | Use public_sendJacob Vosmaer2016-06-031-2/+1
| * | Argh mixed up all the negativesJacob Vosmaer2016-06-031-2/+2
| * | Remove instances of Auth.newJacob Vosmaer2016-06-031-1/+1
| * | Refactor Gitlab::Auth rate limitingJacob Vosmaer2016-06-032-25/+53
| * | Changes after more review from RémyJacob Vosmaer2016-06-031-13/+13
| * | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-023-4/+4
| * | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-02137-982/+2817
| |\ \
| * | | Remove parallel assignmentJacob Vosmaer2016-05-031-1/+2
| * | | Rubocop and whitespaceJacob Vosmaer2016-05-021-2/+2
| * | | Use correct auth finderJacob Vosmaer2016-05-022-7/+2
| * | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-293-15/+102
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1522-88/+300
| |\ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-1267-349/+946
| |\ \ \ \
| * | | | | Move workhorse protocol code into libJacob Vosmaer2016-04-061-0/+7
| * | | | | Delete dead codeJacob Vosmaer2016-04-061-52/+1
* | | | | | Merge branch 'gh-disable-webhooks' into 'master' Douwe Maan2016-06-081-0/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Check if GitHub rate limite API was reached before update Webhooksgh-disable-webhooksDouglas Barbosa Alexandre2016-06-071-0/+1
* | | | | | Merge branch 'refactor/ci-config-add-facade' into 'master' Rémy Coutable2016-06-073-7/+44
|\ \ \ \ \ \
| * | | | | | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facadeGrzegorz Bizon2016-06-072-2/+2
| * | | | | | Remove duplicated exception in Ci configGrzegorz Bizon2016-06-072-6/+1
| * | | | | | Rename class that loads CI configuration to LoaderGrzegorz Bizon2016-06-063-8/+8
| * | | | | | Extract CI config YAML parser to a separate classGrzegorz Bizon2016-06-032-4/+29
| * | | | | | Add gitlab ci configuration class that holds hashGrzegorz Bizon2016-06-032-7/+24
* | | | | | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-0/+14
* | | | | | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-2/+15
|\ \ \ \ \ \ \
| * | | | | | | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-2/+15
* | | | | | | | Merge branch 'rename-ci-commit-phase-3' into 'master' Douwe Maan2016-06-071-5/+5
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-072-4/+4
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-061-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0625-313/+316
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-031-5/+5
* | | | | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-075-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-072-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | / / / / / / | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0625-313/+316
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-034-4/+41
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-031-3/+3
| * | | | | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-032-3/+3
| * | | | | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-031-1/+1
| * | | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-023-3/+3
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gh-disable-webhooks'Douwe Maan2016-06-072-4/+45
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable Webhooks before proceeding with the GitHub importDouglas Barbosa Alexandre2016-06-062-4/+45
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gh-fix-comments-on-diff'Douwe Maan2016-06-071-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diffDouglas Barbosa Alexandre2016-06-061-0/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'gh-rate-limit'Douwe Maan2016-06-076-36/+96
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Move create! method from formatters to the BaseFormatterDouglas Barbosa Alexandre2016-06-065-10/+14
View Lorry Controller Status