summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Enable Style/MutableConstantDouwe Maan2017-02-2319-27/+27
* Enable Style/DotPositionDouwe Maan2017-02-2319-78/+78
* Merge branch '26570-optimize-latest-pipeline-query' into 'master' Kamil Trzciński2017-02-231-2/+5
|\
| * Consider the case where we don't specify ref for pipelineLin Jen-Shin2017-02-201-3/+5
| * Optimize Ci::Pipeline.latest queryLin Jen-Shin2017-02-201-0/+1
* | Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-222-2/+10
|\ \
| * | Added space indentation in models/merge_requests_closing_issues.rbblackst0ne2017-02-221-2/+2
| * | Refactored count_for_collection() for using pluck instead of selectblackst0ne2017-02-211-3/+3
| * | Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-2111-62/+61
| |\ \
| * | | Add merge request count to each issue on issues listblackst0ne2017-02-172-2/+10
* | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master'Sean McGivern2017-02-222-5/+1
|\ \ \ \
| * | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-212-5/+1
| | |/ / | |/| |
* | | | No more and/orDouwe Maan2017-02-213-3/+3
|/ / /
* | | Improve performance of User Agent DetailZ.J. van de Weg2017-02-201-0/+4
| |/ |/|
* | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-1729-101/+237
|\ \
| * \ Merge branch '26500-informative-slack-notifications' into 'master' Kamil Trzciński2017-02-175-13/+36
| |\ \
| | * | Adding links to user & build in Chat NotificationsPoornima M2017-01-255-13/+36
| * | | Merge branch 'use-update-runner-service' into 'master' Kamil Trzciński2017-02-171-8/+8
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-1532-192/+436
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-078-8/+182
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into use-update-runner-serviceLin Jen-Shin2017-02-0464-430/+691
| | |\ \ \ \ \
| | * | | | | | Remove the key from the queue when runner is deletedLin Jen-Shin2017-01-211-0/+8
| | * | | | | | Prefer service object over after_save hookLin Jen-Shin2017-01-211-8/+0
| * | | | | | | Merge branch '26200-convert-sidebar-to-dropdown' into 'master'Sean McGivern2017-02-171-1/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Drop theme ID from users tableAnnabel Dunstone Gray2017-02-151-1/+0
| * | | | | | | Merge branch 'sh-namespace-cleanup-deleted-projects' into 'master' Douwe Maan2017-02-162-2/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fix a number of race conditions that can occur during namespace deletionsh-namespace-cleanup-deleted-projectsStan Hu2017-02-152-2/+12
| | |/ / / / / /
| * | | | | | | Merge branch 'fix/import-hooks' into 'master' Rémy Coutable2017-02-161-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Use gitlab shell import instead of manually creating the webhooksJames Lopez2017-02-161-0/+4
| * | | | | | | Merge branch 'master' into 'zj-remove-deprecated-ci-service'zj-remove-deprecated-ci-serviceDouwe Maan2017-02-157-21/+32
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-142-3/+8
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge branch '19302-wiki-page-delete-does-not-trigger-the-webhook' into 'mast...Rémy Coutable2017-02-141-0/+4
| | | |\ \ \ \ \ \
| | | | * | | | | | Make WikiPage comparable according to StaticModel interfaceMark Fletcher2017-02-141-0/+4
| | | * | | | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-141-3/+4
| | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | | * | | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-131-3/+4
| | * | | | | | | | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-143-16/+22
| | |/ / / / / / /
| | * | | | | | | Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-132-2/+2
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Remove deprecated CI serviceZ.J. van de Weg2017-02-142-9/+1
| |/ / / / / /
| * | | | | | Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-131-1/+6
| |\ \ \ \ \ \
| | * | | | | | Make deploy key not show in User's keys listPawel Chojnacki2017-02-131-1/+6
| * | | | | | | Merge branch '24333-close-issues-with-merge-request-title-ui' into 'master' Rémy Coutable2017-02-131-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Show mentioned/issues being closed from a Merge Requests titleJan Christophersen2017-02-131-2/+2
| | |/ / / / / /
| * | | | | | | Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-131-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use preload for Event#target since it's a polymorphic association27395-reduce-group-activity-sql-queriesRémy Coutable2017-02-131-1/+1
| | * | | | | | | Include :author, :project, and :target in Event.with_associationsRémy Coutable2017-02-131-1/+1
| | * | | | | | | Don't instantiate AR objects in Event.in_projectsRémy Coutable2017-02-131-1/+1
| | |/ / / / / /
| * | | | | | | Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-131-0/+8
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Respect autocrlf setting when creating/updating file through web UIdm-quick-fix-web-edit-new-linesDouwe Maan2017-02-131-0/+8
| | |/ / / / /
| * | | | | | Merge branch '23535-folders-in-wiki-repository' into 'master' Douwe Maan2017-02-132-1/+56
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add WikiPage.unhyphenizeAlex Braha Stoll2017-01-301-1/+5