summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-2343-173/+156
|\
| * Revert "Enable Style/DotPosition"Douwe Maan2017-02-2319-78/+78
| * Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2339-232/+232
| * Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-1/+1
| * Move up delegate callsDouwe Maan2017-02-237-27/+23
| * ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-4/+5
| * Fix new offensesDouwe Maan2017-02-232-2/+2
| * Enable Rails/DelegateDouwe Maan2017-02-235-24/+8
| * Enable Style/WordArrayDouwe Maan2017-02-237-17/+17
| * Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-234-14/+10
| * Enable Style/ClassCheckDouwe Maan2017-02-232-2/+2
| * Prefer leading style for Style/DotPositionDouwe Maan2017-02-2339-231/+231
| * Fix code for copsDouwe Maan2017-02-236-34/+40
| * Enable Style/ConditionalAssignmentDouwe Maan2017-02-236-19/+19
| * Enable Style/ColonMethodCallDouwe Maan2017-02-233-4/+4
| * Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-1/+1
| * Enable Rails/ValidationDouwe Maan2017-02-2311-16/+16
| * Enable Performance/RedundantMatchDouwe Maan2017-02-231-1/+1
| * Enable Performance/RedundantMergeDouwe Maan2017-02-233-3/+3
| * Enable Style/SpaceInsideBracketsDouwe Maan2017-02-233-4/+4
| * Enable Style/MutableConstantDouwe Maan2017-02-2319-27/+27
| * Enable Style/DotPositionDouwe Maan2017-02-2319-78/+78
* | Merge branch 'fix-mr-size-with-over-100-files' into 'master' Sean McGivern2017-02-231-1/+5
|\ \ | |/ |/|
| * Fix MR changes tab size countfix-mr-size-with-over-100-filesSean McGivern2017-02-231-1/+5
* | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
View Lorry Controller Status