diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-01 12:09:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-01 12:09:49 +0300 |
| commit | 17a47c3e305567151191ce166702bd4e35e62a7b (patch) | |
| tree | 782c7a8ff75abc7f95b6801c39397c843ce6adf3 /app/controllers | |
| parent | 916bb1bb577b64ec769b4c081c4f861a2f47322f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/merge_requests/application_controller.rb | 3 | ||||
| -rw-r--r-- | app/controllers/projects/ml/candidates_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/registrations_controller.rb | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests/application_controller.rb b/app/controllers/projects/merge_requests/application_controller.rb index 1af0ce3c35e..fe2a4080e0c 100644 --- a/app/controllers/projects/merge_requests/application_controller.rb +++ b/app/controllers/projects/merge_requests/application_controller.rb @@ -4,6 +4,9 @@ class Projects::MergeRequests::ApplicationController < Projects::ApplicationCont before_action :check_merge_requests_available! before_action :merge_request before_action :authorize_read_merge_request! + before_action do + push_force_frontend_feature_flag(:enforce_locked_labels_on_merge, project&.supports_lock_on_merge?) + end feature_category :code_review_workflow diff --git a/app/controllers/projects/ml/candidates_controller.rb b/app/controllers/projects/ml/candidates_controller.rb index 12111c45fde..9905e454acb 100644 --- a/app/controllers/projects/ml/candidates_controller.rb +++ b/app/controllers/projects/ml/candidates_controller.rb @@ -9,9 +9,7 @@ module Projects feature_category :mlops - def show - @include_ci_info = @candidate.from_ci? && can?(current_user, :read_build, @candidate.ci_build) - end + def show; end def destroy @experiment = @candidate.experiment diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index 72636a89433..ed0f1687420 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -23,6 +23,7 @@ class RegistrationsController < Devise::RegistrationsController before_action :load_recaptcha, only: :new before_action only: [:create] do check_rate_limit!(:user_sign_up, scope: request.ip) + invite_email # set for failure path so we still remember we are invite in form end feature_category :instance_resiliency @@ -271,10 +272,15 @@ class RegistrationsController < Devise::RegistrationsController def set_invite_params if resource.email.blank? && params[:invite_email].present? - resource.email = @invite_email = ActionController::Base.helpers.sanitize(params[:invite_email]) + resource.email = invite_email end end + def invite_email + ActionController::Base.helpers.sanitize(params[:invite_email]) + end + strong_memoize_attr :invite_email + def user_invited? !!member_id end |