summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pedro-mattermost-slack-notifications-text' into 'master' Kamil Trzciński2017-02-262-14/+14
|\
| * Add clearer placeholders and channel definition.Pedro Moreira da Silva2017-02-242-14/+14
* | Merge branch '23062-allow-git-log-to-accept-follow-and-skip' into 'master' Robert Speicher2017-02-251-3/+1
|\ \
| * | Make Git history follow renames again by performing the --skip in RubyRémy Coutable2017-02-231-3/+1
* | | Merge branch 'dm-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-241-181/+32
|\ \ \
| * | | Fix specdm-fix-web-edit-new-linesDouwe Maan2017-02-241-77/+21
| * | | We don't need these checks anymoreDouwe Maan2017-02-241-19/+0
| * | | Address reviewDouwe Maan2017-02-241-2/+2
| * | | Rename commit_file, commit_dir and remove_file and update specsDouwe Maan2017-02-241-8/+6
| * | | Consistently create, update, and delete files, taking CRLF settings into accountDouwe Maan2017-02-241-100/+28
* | | | Merge branch '12726-preserve-issues-after-deleting-users' into 'master' Douwe Maan2017-02-243-9/+86
|\ \ \ \ | |/ / / |/| | |
| * | | Don't allow deleting a ghost user.Timothy Andrew2017-02-241-1/+3
| * | | Implement final review comments from @DouweM and @rymaiTimothy Andrew2017-02-243-42/+41
| * | | Implement review comments from @rymai and @yorickpeterseTimothy Andrew2017-02-242-11/+21
| * | | Use a `ghost` boolean to track ghost users.Timothy Andrew2017-02-241-5/+10
| * | | Implement review comments from @DouweM and @nick.thomas.Timothy Andrew2017-02-241-0/+13
| * | | Extract code from `Namespace#clean_path` for ghost user generation.Timothy Andrew2017-02-243-22/+40
| * | | Deleting a user shouldn't delete associated issues.Timothy Andrew2017-02-241-1/+31
* | | | Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-242-8/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-232-8/+4
| |/ /
* | | Introduce DurationValidator, feedback:27762-add-default-artifacts-expirationLin Jen-Shin2017-02-241-8/+1
* | | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2447-190/+181
|\ \ \ | | |/ | |/|
| * | Merge branch '27989-disable-counting-tags' into 'master' Rémy Coutable2017-02-232-4/+1
| |\ \ | | |/ | |/|
| | * Disable unused tags count cache for Projects, Builds and RunnersPawel Chojnacki2017-02-232-4/+1
| * | 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
View Lorry Controller Status