diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-04 19:14:54 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-04 19:14:54 +0800 |
| commit | 596f46881f2f70cfca8e30794b4c9572a8644ceb (patch) | |
| tree | 723fe19279237e75db07edd2d0569fb629da3a59 /app/models/event.rb | |
| parent | 25dd39f8cfb33c643cef2389b1d9d8f2a4efe915 (diff) | |
| parent | 021b6aef94b3398ab5603b4c11afd4c6d8432795 (diff) | |
| download | gitlab-ce-596f46881f2f70cfca8e30794b4c9572a8644ceb.tar.gz | |
Merge remote-tracking branch 'upstream/master' into save-artifacts_sizes
* upstream/master: (175 commits)
Document Repository#keep_around
Don't garbage collect commits that have related DB records like comments
Update CHANGELOG
Update RedCloth to 4.3.2 for CVE-2012-6684
Fix typo in Merge Requests API documentation
Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq
Enable Style/EmptyLines cop, remove redundant ones
Update CHANGELOG
Cache results from jQuery selectors to retrieve namespace name
Fix import button when import fail due the namespace already been taken
Fix snippets comments not displayed
Fix emoji paths in relative root configurations
Exclude requesters from Project#members, Group#members and User#members
Upgrade Thin from 1.6.1 to 1.7.0.
Many squashed commits
Cache autocomplete results
Upgrade Sidekiq from 4.1.2 to 4.1.4.
Upgrade seed-fu from 2.3.5 to 2.3.6
use has_many relationship with events
Support creating a todo on issuables via API
...
Diffstat (limited to 'app/models/event.rb')
| -rw-r--r-- | app/models/event.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/event.rb b/app/models/event.rb index 716039fb54b..d7d23c7ae6d 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -315,7 +315,7 @@ class Event < ActiveRecord::Base def body? if push? - push_with_commits? + push_with_commits? || rm_ref? elsif note? true else |