diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/comment.go | 4 | ||||
| -rw-r--r-- | models/issue_mail.go | 4 | ||||
| -rw-r--r-- | models/repo.go | 10 | ||||
| -rw-r--r-- | models/repo_test.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/models/comment.go b/models/comment.go index 2b5ac923..7a46f6f8 100644 --- a/models/comment.go +++ b/models/comment.go @@ -16,7 +16,7 @@ import ( api "github.com/gogits/go-gogs-client" "github.com/gogits/gogs/models/errors" - "github.com/gogits/gogs/modules/markdown" + "github.com/gogits/gogs/modules/markup" ) // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference. @@ -168,7 +168,7 @@ func (c *Comment) EventTag() string { // mailParticipants sends new comment emails to repository watchers // and mentioned people. func (cmt *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) (err error) { - mentions := markdown.FindAllMentions(cmt.Content) + mentions := markup.FindAllMentions(cmt.Content) if err = updateIssueMentions(e, cmt.IssueID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", cmt.IssueID, err) } diff --git a/models/issue_mail.go b/models/issue_mail.go index be653b89..d0447261 100644 --- a/models/issue_mail.go +++ b/models/issue_mail.go @@ -11,7 +11,7 @@ import ( log "gopkg.in/clog.v1" "github.com/gogits/gogs/modules/mailer" - "github.com/gogits/gogs/modules/markdown" + "github.com/gogits/gogs/modules/markup" "github.com/gogits/gogs/modules/setting" ) @@ -162,7 +162,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string) // MailParticipants sends new issue thread created emails to repository watchers // and mentioned people. func (issue *Issue) MailParticipants() (err error) { - mentions := markdown.FindAllMentions(issue.Content) + mentions := markup.FindAllMentions(issue.Content) if err = updateIssueMentions(x, issue.ID, mentions); err != nil { return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err) } diff --git a/models/repo.go b/models/repo.go index a597f82e..b12ed58e 100644 --- a/models/repo.go +++ b/models/repo.go @@ -28,7 +28,7 @@ import ( "github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/modules/bindata" - "github.com/gogits/gogs/modules/markdown" + "github.com/gogits/gogs/modules/markup" "github.com/gogits/gogs/modules/process" "github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/sync" @@ -219,7 +219,7 @@ func (repo *Repository) AfterSet(colName string, _ xorm.Cell) { repo.NumOpenMilestones = repo.NumMilestones - repo.NumClosedMilestones case "external_tracker_style": if len(repo.ExternalTrackerStyle) == 0 { - repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC + repo.ExternalTrackerStyle = markup.ISSUE_NAME_STYLE_NUMERIC } case "created_unix": repo.Created = time.Unix(repo.CreatedUnix, 0).Local() @@ -356,10 +356,10 @@ func (repo *Repository) ComposeMetas() map[string]string { "repo": repo.Name, } switch repo.ExternalTrackerStyle { - case markdown.ISSUE_NAME_STYLE_ALPHANUMERIC: - repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_ALPHANUMERIC + case markup.ISSUE_NAME_STYLE_ALPHANUMERIC: + repo.ExternalMetas["style"] = markup.ISSUE_NAME_STYLE_ALPHANUMERIC default: - repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_NUMERIC + repo.ExternalMetas["style"] = markup.ISSUE_NAME_STYLE_NUMERIC } } diff --git a/models/repo_test.go b/models/repo_test.go index 69d90b93..653a0962 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -5,7 +5,7 @@ import ( . "github.com/smartystreets/goconvey/convey" "testing" - "github.com/gogits/gogs/modules/markdown" + "github.com/gogits/gogs/modules/markup" ) func TestRepo(t *testing.T) { |