summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'knapsack' into 'master' Douwe Maan2016-06-071-0/+3
|\
| * Remove knapsack_merger since we don't use it anywayKamil Trzcinski2016-06-072-42/+0
| * Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski2016-06-0749-282/+2707
| |\
| * | Use knapsack everywhereKamil Trzcinski2016-06-031-1/+1
| * | Use own version of knapsack which supports spinach testsKamil Trzcinski2016-06-031-1/+1
| * | Try to use knapsackKamil Trzcinski2016-06-032-0/+45
* | | 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-6/+3
|\ \ \
| * | | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-6/+3
| |/ /
* | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-0741-742/+741
|\ \ \
| * | | 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-071-3/+10
| |\ \ \ | | | |/ | | |/|
| * | | Fix tests failuresKamil Trzcinski2016-06-076-43/+43
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-068-13/+1270
| |\ \ \
| * \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-063-14/+31
| |\ \ \ \
| | * \ \ \ 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-062-12/+8
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0615-59/+668
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0615-59/+668
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0626-193/+729
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0625-192/+728
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-062-2/+2
| * | | | | | | | | Rename remaining ci_commits in specsKamil Trzcinski2016-06-034-5/+5
| * | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-0335-367/+365
| |/ / / / / / / /
| * | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-037-7/+183
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-032-20/+20
| * | | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-036-16/+16
| * | | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-033-3/+3
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-036-5/+49
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-032-2/+2
| * | | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-0321-97/+97
| * | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-0215-28/+28
* | | | | | | | | | Merge branch 'gh-disable-webhooks'Douwe Maan2016-06-071-0/+65
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable Webhooks before proceeding with the GitHub importDouglas Barbosa Alexandre2016-06-061-0/+65
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'gh-fix-comments-on-diff'Douwe Maan2016-06-071-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diffDouglas Barbosa Alexandre2016-06-061-0/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'issue_3359' into 'master' Yorick Peterse2016-06-061-3/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | change add_concurrent_index function argumentsissue_3359Felipe Artur2016-06-061-3/+10
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-068-13/+1270
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Updated MR notes.notes-are-awardablesFatih Acet2016-06-061-4/+4
| * | | | | | | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| * | | | | | | Added tests for award emoji feature.Fatih Acet2016-06-066-13/+1224
| * | | | | | | Backend awardables on commentsZJ van de Weg2016-06-062-0/+46
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'tests/extend-specs-for-build-badge' into 'master' Rémy Coutable2016-06-061-3/+23
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Extend specs for builds badgetests/extend-specs-for-build-badgeGrzegorz Bizon2016-06-031-3/+23
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-062-12/+8
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed JS errorsjquery2Phil Hughes2016-06-052-12/+8
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0614-27/+532
|\ \ \ \ \ \
| * | | | | | Add feature specs covering U2F registration and authentication.Timothy Andrew2016-06-062-0/+275
| * | | | | | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-061-1/+25
| * | | | | | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-063-13/+66
View Lorry Controller Status