summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-27393-1673/+5482
|\
| * Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master' Douwe Maan2017-01-271-0/+24
| |\
| | * Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blobStan Hu2017-01-261-0/+24
| * | Merge branch 'get-rid-of-water-from-notification_service_spec-to-make-it-DRY'...26900-pipelines-tabs-equal-buildsRémy Coutable2017-01-271-228/+87
| |\ \
| | * | Make notification_service spec DRYer by making some tests reusableYarNayar2016-12-121-228/+87
| * | | 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 'rs-empty_project-models' into 'master'Rémy Coutable2017-01-2766-146/+148
| |\ \ \ \
| | * | | | Use `:empty_project` where possible in model specsrs-empty_project-modelsRobert Speicher2017-01-2666-146/+148
| * | | | | Merge branch 'rs-empty_project-requests' into 'master'Rémy Coutable2017-01-2717-44/+44
| |\ \ \ \ \
| | * | | | | Use `:empty_project` where possible in request specsrs-empty_project-requestsRobert Speicher2017-01-2617-44/+44
| | |/ / / /
| * | | | | Merge branch 'depr-devise-test-fixed' into 'master'Rémy Coutable2017-01-271-1/+1
| |\ \ \ \ \
| | * | | | | fix depr. warning; use `Devise::Test::ControllerHelpers`Adam Pahlevi2017-01-261-1/+1
| * | | | | | Merge branch '26844-new-search-bar-performs-a-new-request-for-each-tag' into ...Alfredo Sumaran2017-01-274-0/+70
| |\ \ \ \ \ \
| | * | | | | | Add caching of droplab ajax requests26844-new-search-bar-performs-a-new-request-for-each-tagClement Ho2017-01-264-0/+70
| * | | | | | | Merge branch 'revert-filter-assigned-to-me' into 'master' Filipa Lacerda2017-01-261-16/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Revert 3f17f29arevert-filter-assigned-to-meClement Ho2017-01-261-16/+0
| | |/ / / / / /
| * | | | | | | Merge branch '27044-fix-explore-sorting-on-trending' into 'master' Fatih Acet2017-01-262-0/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Fix /explore sorting (trending)Eric Eastwood2017-01-262-0/+36
| | |/ / / / / /
| * | | | | | | Merge branch '27124-search-bar-does-not-load-discussion-notes-selected-labels...Fatih Acet2017-01-261-0/+6
| |\ \ \ \ \ \ \
| | * | | | | | | Fix filtered search so that labels selected from discussion notes display cor...27124-search-bar-does-not-load-discussion-notes-selected-labelsClement Ho2017-01-251-0/+6
| | |/ / / / / /
| * | | | | | | 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 branch 'add_project_update_hook' into 'master' Rémy Coutable2017-01-261-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Add a system hook for when a project is updated.Tommy Beadle2017-01-261-0/+2
| * | | | | | | | Merge branch '27285-fix-broken-master' into 'master' Sean McGivern2017-01-261-2/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Ensure we have a project with a repo in GitlabMarkdownHelper specsRémy Coutable2017-01-261-2/+1
| * | | | | | | | 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
| * | | | | | | | Merge branch '26068_tasklist_issue' into 'master' Sean McGivern2017-01-261-0/+19
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don’t count tasks that are not defined as list items correctlyJarka Kadlecova2017-01-251-0/+19
| * | | | | | | | | 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 branch 'rs-empty_project-for-associations' into 'master' Rémy Coutable2017-01-2617-19/+27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Use a project factory with a repository where necessaryrs-empty_project-for-associationsRobert Speicher2017-01-254-5/+12
| | * | | | | | | | Factories with a project association use `:empty_project` by defaultRobert Speicher2017-01-2414-14/+15
| * | | | | | | | | Merge branch 'rs-empty_project-helpers' into 'master' Rémy Coutable2017-01-2614-40/+41
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use `:empty_project` where possible in helper specsrs-empty_project-helpersRobert Speicher2017-01-2514-40/+41
| | |/ / / / / / / /
| * | | | | | | | | Merge branch 'rs-empty_project-controllers' into 'master' Rémy Coutable2017-01-2643-74/+67
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Use `empty_project` where possible in controller specsrs-empty_project-controllersRobert Speicher2017-01-2543-74/+67
| | |/ / / / / / / /
| * | | | | | | | | Use `:empty_project` where possible in finder specsrs-empty_project-findersRobert Speicher2017-01-2510-23/+23
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'fix/26518' into 'master' Douwe Maan2017-01-251-0/+22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix access to the wiki code via HTTP when repository feature disabledDouglas Barbosa Alexandre2017-01-251-0/+22
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'copy-as-md' into 'master' Jacob Schatz2017-01-253-13/+448
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2529-74/+603
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | * | | | | | | | Run tests in a single browser sessionDouwe Maan2017-01-241-66/+81
| | * | | | | | | | Merge branch 'master' into copy-as-mdDouwe Maan2017-01-2490-470/+2116
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Improve handling of code blocks containing triple backticksDouwe Maan2017-01-191-1/+11
| | * | | | | | | | | Improve support for linebreaks, tables and nested blockquotes in listsDouwe Maan2017-01-191-7/+22
View Lorry Controller Status