Add latest changes from gitlab-org/gitlab@master

4 files changed, 4 insertions, 16 deletions

diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 5af0c835385..17025670488 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -221,11 +221,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   def ci_environments_status
     environments =
       if ci_environments_status_on_merge_result?
-        if Feature.enabled?(:deployment_merge_requests_widget, @project)
-          EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user)
-        else
-          EnvironmentStatus.after_merge_request(@merge_request, current_user)
-        end
+        EnvironmentStatus.for_deployed_merge_request(@merge_request, current_user)
       else
         EnvironmentStatus.for_merge_request(@merge_request, current_user)
       end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index a89fea4b7b8..9a5c5f274a0 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -143,7 +143,7 @@ module SearchHelper
 
   # Autocomplete results for the current project, if it's defined
   def project_autocomplete
-    if @project && @project.repository.exists? && @project.repository.root_ref
+    if @project && @project.repository.root_ref
       ref = @ref || @project.repository.root_ref
 
       [
diff --git a/app/models/project.rb b/app/models/project.rb
index 6858d03098c..c7c2a9e34fb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1514,7 +1514,7 @@ class Project < ApplicationRecord
   end
 
   def default_branch
-    @default_branch ||= repository.root_ref if repository.exists?
+    @default_branch ||= repository.root_ref
   end
 
   def reload_default_branch
diff --git a/app/workers/deployments/finished_worker.rb b/app/workers/deployments/finished_worker.rb
index bab197a82ff..6196b032f63 100644
--- a/app/workers/deployments/finished_worker.rb
+++ b/app/workers/deployments/finished_worker.rb
@@ -10,17 +10,9 @@ module Deployments
 
     def perform(deployment_id)
       if (deploy = Deployment.find_by_id(deployment_id))
-        link_merge_requests(deploy)
+        LinkMergeRequestsService.new(deploy).execute
         deploy.execute_hooks
       end
     end
-
-    def link_merge_requests(deployment)
-      unless Feature.enabled?(:deployment_merge_requests, deployment.project)
-        return
-      end
-
-      LinkMergeRequestsService.new(deployment).execute
-    end
   end
 end