Skip to content
代码片段 群组 项目
提交 d0fd5202 编辑于 作者: Patrick Bajao's avatar Patrick Bajao
浏览文件

Merge branch '241359-nomethoderror-error' into 'master'

Resolve undefined method `invite_email'

Closes #241359

See merge request gitlab-org/gitlab!42349
No related branches found
No related tags found
无相关合并请求
...@@ -76,8 +76,10 @@ def authenticate_user! ...@@ -76,8 +76,10 @@ def authenticate_user!
notice << "or create an account" if Gitlab::CurrentSettings.allow_signup? notice << "or create an account" if Gitlab::CurrentSettings.allow_signup?
notice = notice.join(' ') + "." 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]) 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 store_location_for :user, request.fullpath
......
---
title: 'Do not raise error when a member is not found by invite token'
merge_request: 42349
author:
type: fixed
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册