summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'test-for-ci_authorized_runners' into 'master' Douwe Maan2016-06-081-4/+84
|\
| * Add a blank line between before and it:Lin Jen-Shin2016-06-071-0/+3
| * Avoid using subject and is_expected.to:Lin Jen-Shin2016-06-071-5/+8
| * Prefer do and end for before/after:Lin Jen-Shin2016-06-071-7/+21
| * Fix method definition styleLin Jen-Shin2016-06-071-2/+2
| * Use rspec's matchers and update style:Lin Jen-Shin2016-06-071-8/+10
| * Use subject for more consistent testing style:Lin Jen-Shin2016-06-071-4/+5
| * This is easier to write:Lin Jen-Shin2016-06-071-1/+1
| * Add a test for User#ci_authorized_runnersLin Jen-Shin2016-06-071-0/+57
* | Enable Knapsack only in CI environmentknapsack-env-ciKamil Trzcinski2016-06-081-2/+4
* | Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz2016-06-071-4/+4
|\ \
| * | Test impersonation using img data attribute instead of usernameAnnabel Dunstone2016-06-071-4/+4
| |/
* | Merge branch 'refactor/ci-config-add-facade' into 'master' Rémy Coutable2016-06-072-0/+97
|\ \
| * | Improve Ci config loader by changing method signaturerefactor/ci-config-add-facadeGrzegorz Bizon2016-06-071-4/+4
| * | Remove duplicated exception in Ci configGrzegorz Bizon2016-06-071-1/+2
| * | Rename class that loads CI configuration to LoaderGrzegorz Bizon2016-06-062-15/+11
| * | Extract CI config YAML parser to a separate classGrzegorz Bizon2016-06-032-1/+67
| * | Add gitlab ci configuration class that holds hashGrzegorz Bizon2016-06-031-0/+34
* | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-074-0/+271
|\ \ \ | |_|/ |/| |
| * | Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-072-1/+61
| * | Clarify issue priority specSean McGivern2016-06-061-14/+7
| * | Remove commentAlfredo Sumaran2016-06-061-1/+0
| * | Add test for the case when user can't prioritize labelsAlfredo Sumaran2016-06-061-47/+77
| * | Fix styleSean McGivern2016-06-061-1/+2
| * | Add tests for issues with multiple labelsAlfredo Sumaran2016-06-061-29/+60
| * | Add tests for issue prioritizationAlfredo Sumaran2016-06-061-0/+63
| * | Add tests for label prioritizationAlfredo Sumaran2016-06-061-0/+78
| * | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-0/+16
* | | 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
View Lorry Controller Status