Show configured GitLab name on Account page

This includes the chosen GitLab display name in the button text.
pull/243/head
Matt Baer 5 years ago
parent 048e8a5e13
commit b25e80bb1b
  1. 2
      account.go
  2. 2
      templates/user/settings.tmpl

@ -1076,6 +1076,7 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
OauthSlack bool
OauthWriteAs bool
OauthGitLab bool
GitLabDisplayName string
}{
UserPage: NewUserPage(app, r, u, "Account Settings", flashes),
Email: fullUser.EmailClear(app.keys),
@ -1087,6 +1088,7 @@ func viewSettings(app *App, u *User, w http.ResponseWriter, r *http.Request) err
OauthSlack: enableOauthSlack,
OauthWriteAs: enableOauthWriteAs,
OauthGitLab: enableOauthGitLab,
GitLabDisplayName: config.OrDefaultString(app.Config().GitlabOauth.DisplayName, gitlabDisplayName),
}
showUserPage(w, "settings", obj)

@ -93,7 +93,7 @@ h3 { font-weight: normal; }
<a class="btn cta loginbtn" id="writeas-login" href="/oauth/write.as?attach=t">Link your <strong>Write.as</strong> account.</a>
{{ end }}
{{ if .OauthGitLab }}
<a class="btn cta loginbtn" id="gitlab-login" href="/oauth/gitlab?attach=t">Link your <strong>GitLab</strong> account.</a>
<a class="btn cta loginbtn" id="gitlab-login" href="/oauth/gitlab?attach=t">Link your <strong>{{.GitLabDisplayName}}</strong> account</a>
{{ end }}
</p>
{{ end }}

Loading…
Cancel
Save