summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Fix note validation spec failuresStan Hu2016-06-012-3/+4
* Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0131-238/+1380
|\
| * Refactor ParticipableYorick Peterse2016-06-018-3/+372
| * Split Markdown rendering & reference gatheringYorick Peterse2016-05-2622-235/+961
| * Added Gitlab::LazyYorick Peterse2016-05-261-0/+37
| * Don't modify arguments in CommitRange#initializeYorick Peterse2016-05-261-0/+10
* | Merge branch 'fix-cancelable-retryable' into 'master' Douwe Maan2016-06-011-0/+30
|\ \
| * | Fix rubocop offensesfix-cancelable-retryableKamil Trzcinski2016-06-011-2/+2
| * | Test cancelability and retriablity of pipeline for generic statusesKamil Trzcinski2016-05-311-0/+30
* | | Merge branch 'fix/error-500-in-pipeline-when-fork' into 'master' Rémy Coutable2016-06-011-0/+58
|\ \ \
| * | | Add feature specs for pipeline in MR from forkGrzegorz Bizon2016-06-011-8/+38
| * | | Add feature test for accessing MR created from forkGrzegorz Bizon2016-06-011-0/+28
* | | | Merge branch 'long.polyglot/gitlab-ce-issue_17479_todos_not_remove_when_leave...Douwe Maan2016-06-011-0/+42
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-3094-353/+1044
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-221-1/+12
| |\ \ \ \ \
| * | | | | | Fix broken specsLong Nguyen2016-05-211-3/+3
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-2122-36/+534
| |\ \ \ \ \ \
| * | | | | | | Fix broken specsLong Nguyen2016-05-211-1/+0
| * | | | | | | Remove todos when destroy project member and specsLong Nguyen2016-05-211-0/+43
* | | | | | | | Merge branch 'rs-remember-me-2fa' into 'master' Douwe Maan2016-06-013-3/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-303-3/+32
* | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-015-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update tests for the current_application_settings request store changesDJ Mountney2016-05-275-12/+12
* | | | | | | | | | Merge branch 'fix-404-labels-in-todos' into 'master' Douwe Maan2016-06-011-0/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix 404 page when viewing TODOs that contain milestones or labels in differen...Stan Hu2016-05-311-0/+21
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-014-30/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-313-30/+30
| * | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-311-0/+9
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-013-22/+48
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'refactoring/improve-build-specs' into 'master' Robert Speicher2016-05-311-22/+20
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove redundant factory namespace in build specsrefactoring/improve-build-specsGrzegorz Bizon2016-05-311-22/+20
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'feature/improve_wiki_page_events' into 'master' Rémy Coutable2016-05-311-0/+13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix hook data for Wiki Page eventGabriel Mazetto2016-05-311-0/+13
| | |/ / / / / / / /
| * | | | | | | | | Fix rubocop offensesKamil Trzcinski2016-05-311-1/+1
| * | | | | | | | | Test token expirabilityKamil Trzcinski2016-05-311-0/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'data_leak' into 'master' Robert Speicher2016-05-311-0/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Confidential notes data leakValery Sizov2016-05-311-0/+19
* | | | | | | | | Merge branch 'make-container-registry-authentication-service-compatible-with-...Stan Hu2016-05-311-29/+17
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make authentication service for Container Registry to be compatible with < Do...make-container-registry-authentication-service-compatible-with-older-dockerKamil Trzcinski2016-05-301-29/+17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'rubocop/enable-performance-times-map-cop' into 'master' Robert Speicher2016-05-301-7/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable Performance/TimesMap Rubocop coprubocop/enable-performance-times-map-copGrzegorz Bizon2016-05-301-7/+2
| |/ / / / / / /
* | | | | | | | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
|/ / / / / / /
* | | | | | | Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2
* | | | | | | Improve note factoryGrzegorz Bizon2016-05-295-20/+18
* | | | | | | Improve notes factoryGrzegorz Bizon2016-05-291-4/+1
* | | | | | | Minor changes in note validation specsGrzegorz Bizon2016-05-294-19/+22
* | | | | | | Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-2914-129/+257
* | | | | | | Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-291-5/+4
* | | | | | | Add more validation tests for note modelGrzegorz Bizon2016-05-291-0/+27
* | | | | | | Update note factory to include noteable associationGrzegorz Bizon2016-05-292-15/+9