Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4846b635
Commit
4846b635
authored
Sep 15, 2020
by
Doug Stull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use correct invite redirect params
parent
684630e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
app/controllers/invites_controller.rb
app/controllers/invites_controller.rb
+3
-1
changelogs/unreleased/241359-nomethoderror-error.yml
changelogs/unreleased/241359-nomethoderror-error.yml
+5
-0
No files found.
app/controllers/invites_controller.rb
View file @
4846b635
...
...
@@ -76,8 +76,10 @@ class InvitesController < ApplicationController
notice
<<
"or create an account"
if
Gitlab
::
CurrentSettings
.
allow_signup?
notice
=
notice
.
join
(
' '
)
+
"."
# this is temporary finder instead of using member method due to render_404 possibility
# will be resolved via https://gitlab.com/gitlab-org/gitlab/-/issues/245325
initial_member
=
Member
.
find_by_invite_token
(
params
[
:id
])
redirect_params
=
initial_member
?
{
invite_email:
member
.
invite_email
}
:
{}
redirect_params
=
initial_member
?
{
invite_email:
initial_
member
.
invite_email
}
:
{}
store_location_for
:user
,
request
.
fullpath
...
...
changelogs/unreleased/241359-nomethoderror-error.yml
0 → 100644
View file @
4846b635
---
title
:
'
Do
not
raise
error
when
a
member
is
not
found
by
invite
token'
merge_request
:
42349
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment