summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-077-31/+30
|\
| * Bump workhorse version to v0.7.5zj-workhorse-to-serve-diffsZ.J. van de Weg2016-06-032-1/+2
| * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-035-30/+28
* | Merge branch 'rename-ci-commit-phase-3' into 'master' Douwe Maan2016-06-0717-91/+91
|\ \
| * | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
| * | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-072-8/+8
| |\ \
| * \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0736-146/+460
| |\ \ \
| * \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0631-156/+1798
| |\ \ \ \
| * \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0653-184/+2031
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-06124-948/+1957
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-034-5/+5
| |\ \ \ \ \ \ \
| * | | | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-0317-88/+88
* | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-0782-894/+895
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Fix remaining test offensesrename-ci-commit-phase-2Kamil Trzcinski2016-06-072-8/+8
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0729-102/+416
| |\ \ \ \ \ \ \
| * | | | | | | | Fix tests failuresKamil Trzcinski2016-06-077-44/+44
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0622-136/+1501
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-069-20/+297
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commitKamil Trzcinski2016-06-061-3/+23
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-068-18/+274
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0653-184/+2031
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0652-180/+2027
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-06124-949/+1958
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-06116-907/+1916
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-0611-44/+44
| * | | | | | | | | | Rename remaining ci_commits in specsKamil Trzcinski2016-06-034-5/+5
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-031-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Fix merge_request handlingKamil Trzcinski2016-06-031-1/+1
| * | | | | | | | | Rename `commit` to `pipeline` in application codeKamil Trzcinski2016-06-032-16/+16
| * | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-0339-375/+373
| |/ / / / / / / /
| * | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-0321-22/+270
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-035-27/+27
| * | | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-038-18/+18
| * | | | | | | | Use foreign_key to define column nameKamil Trzcinski2016-06-031-2/+2
| * | | | | | | | Delegate to pipeline instead of commitKamil Trzcinski2016-06-031-1/+1
| * | | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-0313-20/+20
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0340-204/+270
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-035-10/+10
| * | | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-0324-100/+100
| * | | | | | | | | Use ci_commits tableKamil Trzcinski2016-06-031-0/+2
| * | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-0235-81/+81
* | | | | | | | | | Merge branch 'gh-disable-webhooks'Douwe Maan2016-06-075-4/+115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-061-0/+1
| * | | | | | | | | | Add a message warning user that Webhooks will be disabledDouglas Barbosa Alexandre2016-06-061-0/+4
| * | | | | | | | | | Disable Webhooks before proceeding with the GitHub importDouglas Barbosa Alexandre2016-06-063-4/+110
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gh-fix-comments-on-diff'Douwe Maan2016-06-073-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diffDouglas Barbosa Alexandre2016-06-063-0/+8
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'gh-rate-limit'Douwe Maan2016-06-077-36/+97
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-06-061-0/+1