diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-03 23:52:34 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-03 23:52:34 +0000 |
| commit | e9d06903dab75129a0df63e686e18e85bfaeee8d (patch) | |
| tree | 4a269e39f747439c693b86007e840f31d323bdc2 | |
| parent | 05d5485dd4c9f8c99d52d8001e5cbc85b081429f (diff) | |
| parent | 3b70d5b207e7f9fbd20584d0a42d06609b61e751 (diff) | |
| download | gitlab-ce-e9d06903dab75129a0df63e686e18e85bfaeee8d.tar.gz | |
Merge branch 'fork-event' into 'master'
Don't show project fork event as imported
See merge request !1949
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/event.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 438cae617a7..2f310a4b028 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,7 @@ v 8.3.0 (unreleased) - Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera) - Add ignore whitespace change option to commit view - Fire update hook from GitLab + - Don't show project fork event as "imported" v 8.2.2 - Fix 404 in redirection after removing a project (Stan Hu) diff --git a/app/models/event.rb b/app/models/event.rb index 9afd223bce5..01d008035a5 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -201,7 +201,7 @@ class Event < ActiveRecord::Base elsif commented? "commented on" elsif created_project? - if project.import? + if project.external_import? "imported" else "created" |