Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c12caecdc23..a6bc754d09e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -38,8 +38,7 @@ class ProjectsController < Projects::ApplicationController
before_action do
push_frontend_feature_flag(:highlight_js, @project)
- push_frontend_feature_flag(:file_line_blame, @project)
- push_frontend_feature_flag(:synchronize_fork, @project)
+ push_frontend_feature_flag(:synchronize_fork, @project&.fork_source)
push_licensed_feature(:file_locks) if @project.present? && @project.licensed_feature_available?(:file_locks)
push_licensed_feature(:security_orchestration_policies) if @project.present? && @project.licensed_feature_available?(:security_orchestration_policies)
push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?)
@@ -209,7 +208,7 @@ class ProjectsController < Projects::ApplicationController
end
def new_issuable_address
- return render_404 unless Gitlab::IncomingEmail.supports_issue_creation?
+ return render_404 unless Gitlab::Email::IncomingEmail.supports_issue_creation?
current_user.reset_incoming_email_token!
render json: { new_address: @project.new_issuable_address(current_user, params[:issuable_type]) }