summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-0/+60
|\
| * Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-0/+60
* | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-065-47/+85
|\ \ | |/
| * Fix rubocop offense in awardable specsfix/rubocop-offense-in-specsGrzegorz Bizon2016-06-061-3/+2
| * Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0315-34/+543
| |\
| * | Incorportate feedbackZ.J. van de Weg2016-06-011-2/+1
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-3015-127/+226
| |\ \
| * | | Remove old tests, and use right factoriesZJ van de Weg2016-05-251-60/+0
| * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-257-19/+120
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-182-2/+94
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1813-41/+163
| |\ \ \ \ \
| * | | | | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-121-0/+30
| * | | | | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-33/+2
| * | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-112-2/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1163-1139/+1318
| |\ \ \ \ \ \ \
| * | | | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-103-0/+54
| * | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-063-53/+31
* | | | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-035-14/+14
* | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-033-0/+48
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | issuable#labels_array explicitly load the labelsPaco Guzman2016-06-021-0/+14
| * | | | | | | | Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-022-0/+34
* | | | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-034-46/+46
* | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-023-4/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Upgrade attr_encrypted and encryptorConnor Shea2016-05-301-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-011-14/+9
* | | | | | | | Merge remote-tracking branch 'origin/master' into downcase-registry-repositoryKamil Trzcinski2016-06-012-3/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix note validation spec failuresStan Hu2016-06-012-3/+4
* | | | | | | | | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-011-0/+14
|/ / / / / / / /
* | | | | | | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-018-3/+382
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor ParticipableYorick Peterse2016-06-018-3/+372
| * | | | | | | | Don't modify arguments in CommitRange#initializeYorick Peterse2016-05-261-0/+10
* | | | | | | | | 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-3016-138/+256
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | 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-212-1/+30
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix broken specsLong Nguyen2016-05-211-1/+0
| * | | | | | | | | | Remove todos when destroy project member and specsLong Nguyen2016-05-211-0/+43
* | | | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-4/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update tests for the current_application_settings request store changesDJ Mountney2016-05-271-4/+4
* | | | | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-011-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-311-4/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-012-22/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Fix hook data for Wiki Page eventGabriel Mazetto2016-05-311-0/+13
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'data_leak' into 'master' Robert Speicher2016-05-311-0/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Confidential notes data leakValery Sizov2016-05-311-0/+19
| |/ / / / / / / / / /
* | | | | | | | | | | Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2
* | | | | | | | | | | Improve note factoryGrzegorz Bizon2016-05-292-4/+6