Merge branch 'fork-event' into 'master'

Don't show project fork event as imported

See merge request !1949
This commit is contained in:
Robert Speicher
2015-12-03 23:52:34 +00:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -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)
+1 -1
View File
@@ -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"