Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include query in sign in redirect #11579

Merged
merged 4 commits into from
Jun 4, 2020
Merged

Include query in sign in redirect #11579

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ba73cc
Include query in sign in redirect
mrsdizzie May 22, 2020
328a18e
Merge branch 'master' into context-link
mrsdizzie May 26, 2020
260aee8
Apply suggestions from code review
mrsdizzie May 28, 2020
7a048a1
Merge branch 'master' into context-link
techknowlogick Jun 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ func Contexter() macaron.Handler {
}
ctx.Data["Language"] = ctx.Locale.Language()
c.Data["Link"] = ctx.Link
ctx.Data["SignInLink"] = setting.AppSubURL + c.Req.URL.RequestURI()
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
ctx.Data["PageStartTime"] = time.Now()
// Quick responses appropriate go-get meta with status 200
// regardless of if user have access to the repository,
Expand Down
2 changes: 1 addition & 1 deletion templates/base/head_navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
{{svg "octicon-person" 16}} {{.i18n.Tr "register"}}
</a>
{{end}}
<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.Link}}">
<a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/login?redirect_to={{.SignInLink}}">
mrsdizzie marked this conversation as resolved.
Show resolved Hide resolved
{{svg "octicon-sign-in" 16}} {{.i18n.Tr "sign_in"}}
</a>
</div><!-- end anonymous right menu -->
Expand Down