summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+8
* emoji aliases problemValery Sizov2015-12-111-1/+2
* Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence'Douwe Maan2015-12-111-2/+18
|\
| * Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-12-1062-553/+1175
| |\
| * | Licence also accepted as license fileZeger-Jan van de Weg2015-12-101-7/+15
| * | Merge branch 'master' into copying-file-seen-as-licenceZeger-Jan van de Weg2015-11-1134-216/+414
| |\ \
| * | | Add specs on #licenseZeger-Jan van de Weg2015-10-151-1/+5
| * | | Prefer Licence over CopyingZeger-Jan van de Weg2015-10-141-3/+7
| * | | COPYING is now also accepted as licence fileZeger-Jan van de Weg2015-10-141-3/+3
* | | | Merge remote-tracking branch 'origin/emoji_edit_disallow'Dmitriy Zaporozhets2015-12-101-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Don't allow to edit award emoji commentsemoji_edit_disallowValery Sizov2015-12-101-1/+1
* | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-cachingDouwe Maan2015-12-1011-61/+131
|\ \ \ \ | |/ / /
| * | | Merge branch 'issue_3854' into 'master' Dmitriy Zaporozhets2015-12-091-2/+2
| |\ \ \
| | * | | Normalize email when looking for GitLab users from commit info. #3854issue_3854Rubén Dávila2015-12-091-2/+2
| * | | | Merge remote-tracking branch 'origin/mr-broken'Dmitriy Zaporozhets2015-12-091-0/+4
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into mr-brokenDouwe Maan2015-12-081-1/+1
| | |\ \ \ \
| | * | | | | Add indication to merge request list item that MR cannot be merged automaticallyDouwe Maan2015-12-081-0/+4
| * | | | | | Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' Dmitriy Zaporozhets2015-12-091-8/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-0823-149/+310
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-046-20/+15
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fix-admin-should-be-able-to-add-himself-to-groupDouglas Barbosa Alexandre2015-12-033-3/+8
| | |\ \ \ \ \ \ \
| | * | | | | | | | Signed in admin should be able to add/remove himself to a projectDouglas Barbosa Alexandre2015-12-011-4/+2
| | * | | | | | | | Signed in admin should be able to add/remove himself to a groupDouglas Barbosa Alexandre2015-12-011-4/+2
| * | | | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-096-0/+37
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update annotationsStan Hu2015-12-085-0/+26
| | * | | | | | | | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-081-0/+11
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-081-0/+11
| | | | |_|_|_|/ / / | | | |/| | | | | |
| * | | | | | | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-081-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-0/+12
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0818-106/+179
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0730-235/+463
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Incorporate feedbackZeger-Jan van de Weg2015-12-051-22/+24
| * | | | | | | | | | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-7/+6
| * | | | | | | | | | Refactor MergeWhenBuildSucceedsService and incorporate feedbackZeger-Jan van de Weg2015-11-231-2/+9
| * | | | | | | | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-11-1847-230/+451
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API support, incorporated feedbackZeger-Jan van de Weg2015-11-182-2/+6
| * | | | | | | | | | | Merge when build succeedsZeger-Jan van de Weg2015-11-023-0/+54
* | | | | | | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' Robert Speicher2015-12-085-18/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingreference-pipeline-and-cachingDouwe Maan2015-12-0817-80/+90
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0716-89/+235
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-033-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-12-0218-129/+208
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-11-1947-273/+588
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Reset memoized project repository when path changesDouwe Maan2015-10-271-0/+1
| * | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-278-25/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Use faster, more appropriate pipeline for mentionable attributesDouwe Maan2015-10-222-2/+2
| * | | | | | | | | | | | | Merge branch 'master' into reference-pipeline-and-cachingDouwe Maan2015-10-2125-106/+213
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove stray conflict markerDouwe Maan2015-10-151-1/+0
| * | | | | | | | | | | | | | Merge branch 'master' into rs-redactor-filterDouwe Maan2015-10-147-56/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Cache rendered contents of issues, MRs and notesDouwe Maan2015-10-143-17/+27
View Lorry Controller Status