summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Allow custom text on 'almost there' pageSean McGivern2016-06-081-1/+4
* Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-081-3/+21
* Remove `projects` inclusion in `notes_with_associations` to skip some unneces...Alejandro Rodríguez2016-06-083-3/+3
* Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-071-1/+1
|\
| * Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-071-1/+1
* | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-073-3/+38
|\ \ | |/ |/|
| * Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-2/+2
| * Remove unnecessary null-specific orderSean McGivern2016-06-061-2/+2
| * typoAlfredo Sumaran2016-06-061-1/+1
| * Update method nameAlfredo Sumaran2016-06-061-2/+2
| * Add unprioritized scopeAlfredo Sumaran2016-06-061-3/+5
| * Improve Issuable.order_labels_priorityRémy Coutable2016-06-063-29/+30
| * Sort by label priorityThijs Wouters2016-06-062-1/+31
| * Prioritize labels functionalityAlfredo Sumaran2016-06-061-0/+2
* | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-7/+0
|\ \
| * | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-7/+0
* | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+1
| |\ \
| | * | Backend awardables on commentsZJ van de Weg2016-06-061-0/+1
* | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-11/+74
|\ \ \ \ | |/ / /
| * | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-062-11/+74
| |/ /
* | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-067-77/+121
|\ \ \ | |/ /
| * | 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
| |\ \ \ | | | |/ | | |/|
| * | | Incorportate feedbackZ.J. van de Weg2016-06-013-14/+10
| * | | Merge branch 'master' into awardablesZJ van de Weg2016-05-304-13/+23
| |\ \ \
| * \ \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-2515-82/+179
| |\ \ \ \
| * | | | | Fix backend merge mistakesZJ van de Weg2016-05-191-1/+1
| * | | | | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-9/+0
| |\ \ \ \ \
| | * | | | | Fix latests concernsZJ van de Weg2016-05-181-9/+0
| * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-182-3/+34
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-1817-221/+329
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-122-1/+9
| * | | | | | | Incorporate feedbackZeger-Jan van de Weg2016-05-113-10/+6
| * | | | | | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-113-3/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1191-1745/+552
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-1/+0
| * | | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-066-73/+130
* | | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-031-4/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | 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 other places where we still use commit attribute of BuildKamil Trzcinski2016-06-031-1/+1
* | | | | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-032-2/+2
* | | | | | | | | | Use foreign_key to define column nameKamil Trzcinski2016-06-031-2/+2
* | | | | | | | | | Delegate to pipeline instead of commitKamil Trzcinski2016-06-031-1/+1
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-034-0/+48
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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