aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
Diffstat (limited to 'models')
-rw-r--r--models/action.go6
-rw-r--r--models/pull.go2
-rw-r--r--models/repo.go6
-rw-r--r--models/user.go16
-rw-r--r--models/webhook_discord.go10
-rw-r--r--models/webhook_slack.go10
6 files changed, 25 insertions, 25 deletions
diff --git a/models/action.go b/models/action.go
index 0ad5f287..4d206894 100644
--- a/models/action.go
+++ b/models/action.go
@@ -136,8 +136,8 @@ func (a *Action) ShortRepoPath() string {
}
func (a *Action) GetRepoLink() string {
- if len(setting.AppSubUrl) > 0 {
- return path.Join(setting.AppSubUrl, a.GetRepoPath())
+ if len(setting.AppSubURL) > 0 {
+ return path.Join(setting.AppSubURL, a.GetRepoPath())
}
return "/" + a.GetRepoPath()
}
@@ -540,7 +540,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
return nil
}
- compareURL := setting.AppUrl + opts.Commits.CompareURL
+ compareURL := setting.AppURL + opts.Commits.CompareURL
if isNewRef {
compareURL = ""
if err = PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
diff --git a/models/pull.go b/models/pull.go
index 5f7cbb57..cc94ee3e 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -324,7 +324,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
Ref: git.BRANCH_PREFIX + pr.BaseBranch,
Before: pr.MergeBase,
After: pr.MergedCommitID,
- CompareURL: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
+ CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
Commits: commits,
Repo: pr.BaseRepo.APIFormat(nil),
Pusher: pr.HeadRepo.MustOwner().APIFormat(),
diff --git a/models/repo.go b/models/repo.go
index c9cf64c5..476a7868 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -279,7 +279,7 @@ func (repo *Repository) FullName() string {
}
func (repo *Repository) HTMLURL() string {
- return setting.AppUrl + repo.FullName()
+ return setting.AppURL + repo.FullName()
}
// Arguments that are allowed to be nil: permission
@@ -458,7 +458,7 @@ func (repo *Repository) RelLink() string {
}
func (repo *Repository) Link() string {
- return setting.AppSubUrl + "/" + repo.FullName()
+ return setting.AppSubURL + "/" + repo.FullName()
}
func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) string {
@@ -597,7 +597,7 @@ type CloneLink struct {
// ComposeHTTPSCloneURL returns HTTPS clone URL based on given owner and repository name.
func ComposeHTTPSCloneURL(owner, repo string) string {
- return fmt.Sprintf("%s%s/%s.git", setting.AppUrl, owner, repo)
+ return fmt.Sprintf("%s%s/%s.git", setting.AppURL, owner, repo)
}
func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
diff --git a/models/user.go b/models/user.go
index 9f7b602a..79774ae8 100644
--- a/models/user.go
+++ b/models/user.go
@@ -175,18 +175,18 @@ func (u *User) CanImportLocal() bool {
// DashboardLink returns the user dashboard page link.
func (u *User) DashboardLink() string {
if u.IsOrganization() {
- return setting.AppSubUrl + "/org/" + u.Name + "/dashboard/"
+ return setting.AppSubURL + "/org/" + u.Name + "/dashboard/"
}
- return setting.AppSubUrl + "/"
+ return setting.AppSubURL + "/"
}
// HomeLink returns the user or organization home page link.
func (u *User) HomeLink() string {
- return setting.AppSubUrl + "/" + u.Name
+ return setting.AppSubURL + "/" + u.Name
}
func (u *User) HTMLURL() string {
- return setting.AppUrl + u.Name
+ return setting.AppURL + u.Name
}
// GenerateEmailActivateCode generates an activate code based on user information and given e-mail.
@@ -242,7 +242,7 @@ func (u *User) GenerateRandomAvatar() error {
// which includes app sub-url as prefix. However, it is possible
// to return full URL if user enables Gravatar-like service.
func (u *User) RelAvatarLink() string {
- defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.png"
+ defaultImgUrl := setting.AppSubURL + "/img/avatar_default.png"
if u.ID == -1 {
return defaultImgUrl
}
@@ -252,7 +252,7 @@ func (u *User) RelAvatarLink() string {
if !com.IsExist(u.CustomAvatarPath()) {
return defaultImgUrl
}
- return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
+ return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
case setting.DisableGravatar, setting.OfflineMode:
if !com.IsExist(u.CustomAvatarPath()) {
if err := u.GenerateRandomAvatar(); err != nil {
@@ -260,7 +260,7 @@ func (u *User) RelAvatarLink() string {
}
}
- return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
+ return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
}
return tool.AvatarLink(u.AvatarEmail)
}
@@ -269,7 +269,7 @@ func (u *User) RelAvatarLink() string {
func (u *User) AvatarLink() string {
link := u.RelAvatarLink()
if link[0] == '/' && link[1] != '/' {
- return setting.AppUrl + strings.TrimPrefix(link, setting.AppSubUrl)[1:]
+ return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
}
return link
}
diff --git a/models/webhook_discord.go b/models/webhook_discord.go
index e452043c..9cacc837 100644
--- a/models/webhook_discord.go
+++ b/models/webhook_discord.go
@@ -77,7 +77,7 @@ func getDiscordCreatePayload(p *api.CreatePayload) (*DiscordPayload, error) {
return &DiscordPayload{
Embeds: []*DiscordEmbedObject{{
Description: content,
- URL: setting.AppUrl + p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
Author: &DiscordEmbedAuthorObject{
Name: p.Sender.UserName,
IconURL: p.Sender.AvatarUrl,
@@ -94,7 +94,7 @@ func getDiscordDeletePayload(p *api.DeletePayload) (*DiscordPayload, error) {
return &DiscordPayload{
Embeds: []*DiscordEmbedObject{{
Description: content,
- URL: setting.AppUrl + p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
Author: &DiscordEmbedAuthorObject{
Name: p.Sender.UserName,
IconURL: p.Sender.AvatarUrl,
@@ -111,7 +111,7 @@ func getDiscordForkPayload(p *api.ForkPayload) (*DiscordPayload, error) {
return &DiscordPayload{
Embeds: []*DiscordEmbedObject{{
Description: content,
- URL: setting.AppUrl + p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
Author: &DiscordEmbedAuthorObject{
Name: p.Sender.UserName,
IconURL: p.Sender.AvatarUrl,
@@ -159,7 +159,7 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa
AvatarURL: slack.IconURL,
Embeds: []*DiscordEmbedObject{{
Description: content,
- URL: setting.AppUrl + p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
Color: int(color),
Author: &DiscordEmbedAuthorObject{
Name: p.Sender.UserName,
@@ -360,7 +360,7 @@ func getDiscordReleasePayload(p *api.ReleasePayload) (*DiscordPayload, error) {
return &DiscordPayload{
Embeds: []*DiscordEmbedObject{{
Description: content,
- URL: setting.AppUrl + p.Sender.UserName,
+ URL: setting.AppURL + p.Sender.UserName,
Author: &DiscordEmbedAuthorObject{
Name: p.Sender.UserName,
IconURL: p.Sender.AvatarUrl,
diff --git a/models/webhook_slack.go b/models/webhook_slack.go
index e092d221..76954795 100644
--- a/models/webhook_slack.go
+++ b/models/webhook_slack.go
@@ -146,7 +146,7 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
}
func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) (*SlackPayload, error) {
- senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName)
+ senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Index),
fmt.Sprintf("#%d %s", p.Index, p.Issue.Title))
var text, title, attachmentText string
@@ -164,7 +164,7 @@ func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) (*SlackPayloa
attachmentText = SlackTextFormatter(p.Issue.Body)
case api.HOOK_ISSUE_ASSIGNED:
text = fmt.Sprintf("[%s] Issue assigned to %s: %s by %s", p.Repository.FullName,
- SlackLinkFormatter(setting.AppUrl+p.Issue.Assignee.UserName, p.Issue.Assignee.UserName),
+ SlackLinkFormatter(setting.AppURL+p.Issue.Assignee.UserName, p.Issue.Assignee.UserName),
titleLink, senderLink)
case api.HOOK_ISSUE_UNASSIGNED:
text = fmt.Sprintf("[%s] Issue unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)
@@ -192,7 +192,7 @@ func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) (*SlackPayloa
}
func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) (*SlackPayload, error) {
- senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName)
+ senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d#%s", p.Repository.HTMLURL, p.Issue.Index, CommentHashTag(p.Comment.ID)),
fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title))
var text, title, attachmentText string
@@ -226,7 +226,7 @@ func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) (
}
func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*SlackPayload, error) {
- senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName)
+ senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
titleLink := SlackLinkFormatter(fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index),
fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title))
var text, title, attachmentText string
@@ -248,7 +248,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
attachmentText = SlackTextFormatter(p.PullRequest.Body)
case api.HOOK_ISSUE_ASSIGNED:
text = fmt.Sprintf("[%s] Pull request assigned to %s: %s by %s", p.Repository.FullName,
- SlackLinkFormatter(setting.AppUrl+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName),
+ SlackLinkFormatter(setting.AppURL+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName),
titleLink, senderLink)
case api.HOOK_ISSUE_UNASSIGNED:
text = fmt.Sprintf("[%s] Pull request unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)
Powered by cgit, Themed by Ted Yin.