mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-13 14:46:05 +10:00
Merge branch 'fork-event' into 'master'
Don't show project fork event as imported See merge request !1949
This commit is contained in:
@@ -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
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user