summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* 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 'build-related-fixes' into 'master' Dmitriy Zaporozhets2015-12-081-1/+1
| |\ \ | | |/ | |/|
| | * Memoize ci_yaml_file.Douwe Maan2015-12-081-1/+1
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-0/+12
|\ \ \ | |/ /
| * | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-0/+12
| |\ \ | | |/ | |/|
| | * Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-0/+4
| | * Recursivity needed if a fork is a fork of a fork.Marin Jankovski2015-12-041-1/+1
| | * Don't show diffs for lfs pointers.Marin Jankovski2015-12-041-2/+0
| | * If a user clicks on the LFS object, it should be served if the user has acces...Marin Jankovski2015-12-031-0/+10
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-0818-106/+179
|\ \ \ | |/ /
| * | Add custom NamespaceNameValidatorRobert Speicher2015-12-071-3/+3
| * | Add custom NamespaceValidatorRobert Speicher2015-12-072-9/+5
| * | Add custom LineCodeValidatorRobert Speicher2015-12-072-2/+2
| * | Add custom ColorValidatorRobert Speicher2015-12-072-7/+5
| * | Add custom UrlValidatorRobert Speicher2015-12-078-37/+27
| * | Merge branch 'fix-parallel-merge' into 'master' Dmitriy Zaporozhets2015-12-071-2/+2
| |\ \
| | * | Dont use cached collection for Repository find_branch and find_tag methodsDmitriy Zaporozhets2015-12-071-2/+2
| * | | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-17/+19
| |\ \ \ | | |/ / | |/| |
| | * | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-17/+19
| * | | Merge branch 'webhook_payload_with_changes' into 'master' Valery Sizov2015-12-072-3/+27
| |\ \ \
| | * | | fixes after reviewwebhook_payload_with_changesValery Sizov2015-12-071-16/+9
| | * | | fox specsValery Sizov2015-12-072-15/+24
| | * | | Add added, modified and removed properties to commit object in webhookValery Sizov2015-12-041-1/+23
| | |/ /
| * | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-071-0/+29
| |\ \ \
| | * | | Satisfy RubocopDouwe Maan2015-12-071-1/+1
| | * | | Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-0713-63/+146
| | |\ \ \
| | * | | | sort milestones by due_dateGreg Smethells2015-12-031-1/+30
| | | |_|/ | | |/| |
| * | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-071-0/+30
| |\ \ \ \
| | * | | | Simplify `contains_emoji_only?` method in `Note`fix/award-emoji-conflict-in-notesGrzegorz Bizon2015-12-071-2/+1
| | * | | | Refactor note awards to reuse `emoji_pattern` and improve validatorGrzegorz Bizon2015-12-051-18/+14
| | * | | | Make method `supports_award?` public in `Note`Grzegorz Bizon2015-12-031-2/+2
| | * | | | Support emoji awards also in merge requestsGrzegorz Bizon2015-12-031-3/+4
| | * | | | Move note emoji-award implementation to note model (feature envy)Grzegorz Bizon2015-12-031-0/+33
| | * | | | Add validator for award-emoji noteGrzegorz Bizon2015-12-031-0/+1
| | |/ / /
| * | | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-071-1/+1
| |\ \ \ \
| | * | | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'issue_1156'Douwe Maan2015-12-071-25/+29
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Run custom Git hooks when creating or deleting branches through the UI. #1156Rubén Dávila2015-12-031-25/+29
| | |/ /
* | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0730-235/+463
|\ \ \ \ | |/ / /
| * | | Merge branch 'link-refs' into 'master' Robert Speicher2015-12-047-43/+131
| |\ \ \
| | * \ \ Merge branch 'master' into link-refsDouwe Maan2015-12-033-3/+8
| | |\ \ \ | | | |/ /
| | * | | Merge branch 'master' into link-refsDouwe Maan2015-12-024-10/+13
| | |\ \ \
| | * | | | Satisfy RubocopDouwe Maan2015-12-021-1/+1
| | * | | | Fix referenced_mentionables method.Douwe Maan2015-12-011-1/+1
| | * | | | Autolink first so we don't pick up numeric anchors as issue references.Douwe Maan2015-12-015-25/+10
| | * | | | Render commit reference using short sha, but include full sha in comment.Douwe Maan2015-12-013-0/+20
View Lorry Controller Status