summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+1
|\
| * Backend awardables on commentsZJ van de Weg2016-06-061-0/+1
* | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-062-11/+74
|/
* Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master' Robert Speicher2016-06-051-1/+1
|\
| * Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lintGrzegorz Bizon2016-06-031-1/+1
* | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-0323-117/+299
|\ \
| * \ Merge branch '13312-remove-issuable-is_assigned' into 'master' Robert Speicher2016-06-031-4/+0
| |\ \ | | |/ | |/|
| | * Remove unused Issuable#is_assigned? method13312-remove-issuable-is_assignedRémy Coutable2016-06-021-4/+0
| * | fix some issues and improved error output for forkingJames Lopez2016-06-021-1/+8
| * | some refactoring and fixing specJames Lopez2016-06-021-0/+5
| * | issuable#labels_array explicitly load the labelsPaco Guzman2016-06-021-0/+4
| * | Refactor. Add tests.Josh Frye2016-06-022-7/+3
| * | Invalidate cache on build changeJosh Frye2016-06-022-1/+6
| * | Cache project build count. Closes #18032Josh Frye2016-06-021-0/+6
| |/
| * Update specs. Add CHANGELOG entryissue-18036Josh Frye2016-06-021-1/+1
| * Flush cache in callback. Add testsJosh Frye2016-06-022-4/+17
| * Cache assigned open issue count. Closes #18035Josh Frye2016-06-021-2/+8
| * Cache assigned merge request count. Closes #18036Josh Frye2016-06-021-0/+6
| * Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-023-3/+12
| |\
| | * Upgrade attr_encrypted and encryptorConnor Shea2016-05-303-2/+11
| | * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+1
| * | Introduce container_registry_path_with_namespacedowncase-registry-repositoryKamil Trzcinski2016-06-011-3/+7
| * | Use downcased path to container repository as this is expected path by DockerKamil Trzcinski2016-06-011-3/+3
| * | Merge branch 'style/enable-semicolon-rubocop-cop' into 'master' Robert Speicher2016-06-011-1/+1
| |\ \
| | * | Enable Style/Semicolon rubocop style copstyle/enable-semicolon-rubocop-copGrzegorz Bizon2016-06-011-1/+1
| * | | Merge branch 'rubocop/enable-style-for-cop' into 'master' Robert Speicher2016-06-011-3/+3
| |\ \ \
| | * | | Enable Style/For rubocop coprubocop/enable-style-for-copGrzegorz Bizon2016-06-011-3/+3
| | |/ /
| * | | Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-0110-74/+129
| |\ \ \
| | * | | Refactor ParticipableYorick Peterse2016-06-018-63/+119
| | * | | Refactor MentionableYorick Peterse2016-05-261-10/+9
| | * | | Don't modify arguments in CommitRange#initializeYorick Peterse2016-05-261-1/+1
| * | | | Merge branch 'fix-cancelable-retryable' into 'master' Douwe Maan2016-06-011-0/+4
| |\ \ \ \
| | * | | | Pipelines can be canceled only when there are running buildsKamil Trzcinski2016-05-311-0/+4
| | | |_|/ | | |/| |
| * | | | Merge branch 'long.polyglot/gitlab-ce-issue_17479_todos_not_remove_when_leave...Douwe Maan2016-06-011-1/+6
| |\ \ \ \
| | * | | | Add changelog and code refactorLong Nguyen2016-05-301-1/+5
| | * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-308-17/+28
| | |\ \ \ \
| | * | | | | Fix Member specLong Nguyen2016-05-221-1/+1
| | * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-213-20/+95
| | |\ \ \ \ \
| | * | | | | | Fix broken specsLong Nguyen2016-05-211-2/+1
| | * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-211-8/+3
| | |\ \ \ \ \ \
| | * | | | | | | Remove todos when destroy project member and specsLong Nguyen2016-05-212-2/+4
| | * | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-2018-91/+212
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_1...Long Nguyen2016-05-145-185/+192
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Only show todos of projects that user is a member ofLong Nguyen2016-05-141-1/+1
| * | | | | | | | | | Merge branch 'current-settings-use-request-store-during-request'Douwe Maan2016-06-011-0/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Try and use cache for application settings even when the db is not connectedcurrent-settings-use-request-store-during-requestDJ Mountney2016-05-291-0/+4
| * | | | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-3/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-312-8/+7
| | * | | | | | | | | | | Fix error 500 when sorting issues by milestone due date and filtering by labelsFelipe Artur2016-05-311-2/+19
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-012-1/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |