diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 4 | ||||
| -rw-r--r-- | app/models/project.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 9939167e74f..a28e054e13c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -163,7 +163,7 @@ class MergeRequest < ApplicationRecord state_machine :merge_status, initial: :unchecked do event :mark_as_unchecked do transition [:can_be_merged, :checking, :unchecked] => :unchecked - transition [:cannot_be_merged, :cannot_be_merged_recheck] => :cannot_be_merged_recheck + transition [:cannot_be_merged, :cannot_be_merged_rechecking, :cannot_be_merged_recheck] => :cannot_be_merged_recheck end event :mark_as_checking do @@ -200,7 +200,7 @@ class MergeRequest < ApplicationRecord # rubocop: enable CodeReuse/ServiceClass def check_state?(merge_status) - [:unchecked, :cannot_be_merged_recheck, :checking].include?(merge_status.to_sym) + [:unchecked, :cannot_be_merged_recheck, :checking, :cannot_be_merged_rechecking].include?(merge_status.to_sym) end end diff --git a/app/models/project.rb b/app/models/project.rb index 79785bfce85..5db349463d8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -2402,7 +2402,7 @@ class Project < ApplicationRecord end def deploy_token_create_url(opts = {}) - Gitlab::Routing.url_helpers.create_deploy_token_project_settings_ci_cd_path(self, opts) + Gitlab::Routing.url_helpers.create_deploy_token_project_settings_repository_path(self, opts) end def deploy_token_revoke_url_for(token) |