summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...fix-git-hooks-when-creating-fileLin Jen-Shin2017-02-0223-125/+395
|\
| * Merge branch '24462-reduce_ldap_queries_for_lfs' into 'master' Robert Speicher2017-02-011-26/+70
| |\
| | * Reduce hits to LDAP on Git HTTP auth by reordering auth mechanismsDrew Blessing2017-01-301-26/+70
| * | Merge branch 'zj-format-chat-messages' into 'master' Kamil Trzciński2017-02-0110-70/+228
| |\ \
| | * | Incorporate feedbackZ.J. van de Weg2017-01-302-5/+11
| | * | Rename presenters for consitencyZ.J. van de Weg2017-01-305-4/+21
| | * | Incorporate feedbackZ.J. van de Weg2017-01-309-9/+282
| | * | Chat Commands have presentersZ.J. van de Weg2017-01-3013-341/+203
| | |/
| * | update specfix/import-user-validation-errorJames Lopez2017-01-311-6/+2
| * | add spec replicating validation errorJames Lopez2017-01-311-0/+28
| * | Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-...Kamil Trzciński2017-01-314-4/+4
| |\ \
| | * | Fix broken testsFilipa Lacerda2017-01-254-4/+4
| * | | fix typo in specJames Lopez2017-01-301-1/+1
| * | | programmatically remove encrypted attributes. Added relevant spec.James Lopez2017-01-301-0/+11
| * | | fix spec failuresJames Lopez2017-01-301-2/+2
| * | | fix typoJames Lopez2017-01-301-2/+2
| * | | Ignore encrypted attributes in Import/ExportJames Lopez2017-01-302-4/+23
| | |/ | |/|
| * | Merge branch '26943-fix-user-in-build-presenter' into 'master' Robert Speicher2017-01-273-17/+19
| |\ \
| | * | Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee already...26943-fix-user-in-build-presenterRémy Coutable2017-01-251-4/+3
| | * | Don't override presentee methods for Gitlab::View::Presenter::DelegatedRémy Coutable2017-01-243-17/+20
| * | | Merge branch 'fix-trace-reader-encoding' into 'master' Douwe Maan2017-01-261-2/+14
| |\ \ \
| | * | | Make sure TraceReader uses Encoding.default_externalfix-trace-reader-encodingLin Jen-Shin2017-01-261-2/+14
* | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2665-101/+114
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'rs-empty_project-lib' into 'master' Rémy Coutable2017-01-2665-103/+114
| |\ \ \ \
| | * | | | Use `:empty_project` where possible throughout spec/librs-empty_project-libRobert Speicher2017-01-2565-103/+114
| * | | | | Revert "Make sure TraceReader uses Encoding.default_external"Lin Jen-Shin2017-01-261-14/+2
| * | | | | Make sure TraceReader uses Encoding.default_externalLin Jen-Shin2017-01-261-2/+14
| | |/ / / | |/| | |
* | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-2682-334/+5246
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-251-4/+4
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-252-20/+72
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2417-123/+806
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-1932-137/+525
| | |\ \ \ \ \
| | * | | | | | Fix SyntaxHighlightFilter specDouwe Maan2017-01-171-4/+4
| * | | | | | | Merge branch 'refresh-authorizations-fork-join' into 'master' Douwe Maan2017-01-254-0/+106
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Fix race conditions for AuthorizedProjectsWorkerrefresh-authorizations-fork-joinYorick Peterse2017-01-254-0/+106
| * | | | | | | Merge branch 'no_project_notes' into 'master' Sean McGivern2017-01-251-0/+24
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | address commentsJarka Kadlecova2017-01-251-0/+3
| | * | | | | | make mentions working when project not specifiedJarka Kadlecova2017-01-181-0/+21
| * | | | | | | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' Robert Speicher2017-01-241-20/+48
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Revert "Merge branch 'revert-9cac0317' into 'master' "Grzegorz Bizon2017-01-231-20/+48
| * | | | | | | Merge branch '24833-Allow-to-search-by-commit-hash-within-project' into 'mast...Sean McGivern2017-01-241-0/+115
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Allows to search within project by commit's hashYarNayar2017-01-241-0/+115
| * | | | | | | Merge branch '22619-add-an-email-address-to-unsubscribe-list-header-in-email'...Douwe Maan2017-01-235-3/+106
| |\ \ \ \ \ \ \
| | * | | | | | | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-135-3/+106
| * | | | | | | | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-231-1/+8
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| | * | | | | | | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-131-1/+8
| * | | | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-237-110/+471
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Extend pipeline detailed status factory specsGrzegorz Bizon2017-01-121-17/+28
| | * | | | | | | Fix a Rubocop offense in detailed status factoryGrzegorz Bizon2017-01-121-1/+1
| | * | | | | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-121-12/+113
View Lorry Controller Status