summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-121-0/+54
|\
| * Make spec deterministicuser-events-apiRémy Coutable2016-10-111-11/+9
| * Addresses Robert's feedbackRémy Coutable2016-10-111-2/+3
| * API: New /users/:id/events endpointRémy Coutable2016-10-101-0/+55
* | Merge branch 'speed-up-api-projects-spec' into 'master' Robert Speicher2016-10-121-13/+15
|\ \
| * | Speed up specs for GET /projects/:id/eventsspeed-up-api-projects-specRémy Coutable2016-10-101-13/+15
* | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-1215-44/+75
|\ \ \
| * | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-1114-39/+62
| * | | writes tests to verify the issue is solved and fixes breaking issues.tiagonbotelho2016-10-092-6/+14
* | | | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-112-1/+15
* | | | Merge branch 'allow_multiple_labels_commands' into 'master' Rémy Coutable2016-10-111-0/+43
|\ \ \ \
| * | | | allow multiple labels commandsbarthc2016-10-111-0/+43
* | | | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-111-0/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-1176-345/+2422
| |\ \ \ \ \
| * | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-0/+14
* | | | | | | Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-113-0/+148
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-101-1/+1
| * | | | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-071-0/+17
| * | | | | | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-063-0/+131
* | | | | | | Merge branch 'guests_cant_see_mrs' into 'master' Sean McGivern2016-10-117-6/+125
|\ \ \ \ \ \ \
| * | | | | | | Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-117-6/+125
* | | | | | | | Merge branch 'build-instead-create-in-label-link-spec' into 'master' Dmitriy Zaporozhets2016-10-111-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Build instead create in label_link model specSemyon Pupkov2016-10-111-2/+1
* | | | | | | | | Merge branch 'remove-empty-describe' into 'master' Dmitriy Zaporozhets2016-10-111-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove empty describe block on key spec modelSemyon Pupkov2016-10-111-3/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'atom-routes' into 'master' Robert Speicher2016-10-113-11/+119
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Allow browsing branches that end with '.atom'Sean McGivern2016-10-113-11/+119
* | | | | | | | | Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-111-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-101-0/+10
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-111-0/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a new gitlab:users:clear_all_authentication_tokens taskRémy Coutable2016-10-111-0/+38
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-114-70/+71
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-104-70/+71
* | | | | | | | | | Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-111-2/+18
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Allow empty merge requestsArtem Sidorenko2016-10-111-2/+18
* | | | | | | | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-115-140/+42
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix api users spec for post request with invalid idDmitriy Zaporozhets2016-10-101-4/+4
| * | | | | | | | | Replace undefined Grape routing code from 400 to 404Dmitriy Zaporozhets2016-10-102-26/+28
| * | | | | | | | | Fix API specs behaviour for invalid routingDmitriy Zaporozhets2016-10-102-20/+37
| * | | | | | | | | Catch any undefined API routing and return 400 Bad RequestDmitriy Zaporozhets2016-10-102-3/+5
| * | | | | | | | | Update git over http test to match new routingDmitriy Zaporozhets2016-10-101-3/+2
| * | | | | | | | | Remove NamespacesControllerDmitriy Zaporozhets2016-10-101-118/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix-misnamed-constant' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | HTMLEntityFilter -> HtmlEntityFilterNick Thomas2016-10-101-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'use-let-in-tests' into 'master' Stan Hu2016-10-101-1/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use user from let instead recreate in beforeSemyon Pupkov2016-10-091-1/+0
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'fix/async-pipeline-processing-stale-data' into 'master' Kamil Trzciński2016-10-101-5/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve spec for merge when build succeeds featureGrzegorz Bizon2016-10-081-5/+19
* | | | | | | | | Merge branch 'namespace-validation-fixes' into 'master' Sean McGivern2016-10-102-1/+32
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-072-1/+32