Douwe Maan 021b6aef94 Merge branch '13524-keep-around-commits' into 'master' ...

Don't garbage collect commits that have related DB records like comments

Closes #13524

Also needed for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4101.

See merge request !5062

2016-07-04 04:40:41 +00:00

..

config

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

controllers

Merge branch 'explicit-requesters-scope' into 'master'

2016-07-01 22:23:26 +00:00

factories

Add Todos API

2016-07-01 10:49:34 +02:00

features

Merge branch 'explicit-requesters-scope' into 'master'

2016-07-01 22:23:26 +00:00

finders

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

fixtures

optimize png images losslessly using zopflipng

2016-06-29 19:22:15 +08:00

helpers

Merge branch 'explicit-requesters-scope' into 'master'

2016-07-01 22:23:26 +00:00

initializers

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

javascripts

Merge branch 'emoji-menu-stick-search' into 'master'

2016-06-27 18:03:08 +00:00

lib

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

mailers

Merge branch 'explicit-requesters-scope' into 'master'

2016-07-01 22:23:26 +00:00

models

Merge branch '13524-keep-around-commits' into 'master'

2016-07-04 04:40:41 +00:00

requests

Merge branch 'git-http-kerberos-ce' into 'master'

2016-07-01 22:24:49 +00:00

routing

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

services

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

support

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

tasks/gitlab

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

views

Do not show build retry link when build is active

2016-06-30 11:06:19 +02:00

workers

Enable Style/EmptyLines cop, remove redundant ones

2016-07-01 21:56:17 +02:00

factories_spec.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Remove coveralls lines

2016-06-30 19:52:36 +02:00

teaspoon_env.rb

Revert "Fix merge conflicts - squashed commit"

2016-06-03 11:10:17 +02:00