summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'saml-ldap-link-flow' into 'master' Douwe Maan2016-06-091-0/+18
|\
| * Syntax fixes and better logging around the `ldap_person` method.saml-ldap-link-flowPatricio Cano2016-06-081-2/+1
| * Moved `find_or_create_ldap_user` method to parent class and added logging.Patricio Cano2016-06-071-1/+1
| * Adjust the SAML control flow to allow LDAP identities to be added to an exist...Patricio Cano2016-06-061-0/+19
* | Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse2016-06-093-3/+9
|\ \
| * | Make Omniauth providers specs to not modify global configurationKamil Trzcinski2016-06-083-3/+9
* | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-092-85/+108
|\ \ \ | |/ / |/| |
| * | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-092-85/+108
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-0811-14/+285
|\ \ \
| * \ \ 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-071-0/+16
| |\ \ \
| | * | | Improve Issuable.order_labels_priorityRémy Coutable2016-06-061-0/+16
| * | | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-072-9/+9
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-071-3/+10
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Fix tests failuresKamil Trzcinski2016-06-071-2/+2
| | * | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-2/+23
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commitKamil Trzcinski2016-06-061-3/+23
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | * | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-3/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-3/+3
| | | |\ \ \ \
| | * | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-032-8/+7
| | |/ / / / /
| | * | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-032-0/+64
| | |\ \ \ \ \
| | * | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-032-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | 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 '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 'master' into awardablesawardablesZ.J. van de Weg2016-06-0323-233/+1056
| |\ \ \ | | | |/ | | |/|
| | * | Reduce Namespace queries in UserReferenceFilterbanzai-user-filter-queriesYorick Peterse2016-06-021-0/+19
| | * | Added ReferenceFilter#nodesYorick Peterse2016-06-021-0/+9
| | * | Returning enums in ReferenceFilter#each_nodeYorick Peterse2016-06-021-0/+36
| | |/
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-3019-50/+118
| |\ \
| * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-259-42/+452
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-184-0/+243
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1811-80/+328
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-112-1/+19
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1120-252/+650
| |\ \ \ \ \ \ \
| * | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-3/+3
* | | | | | | | | Changes after more review from RémyJacob Vosmaer2016-06-031-4/+4
* | | | | | | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-021-8/+8
* | | | | | | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-0270-618/+2786
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0121-233/+992
| |\ \ \ \ \ \ \ \
View Lorry Controller Status