Merge branch 'dz-use-less-deprecated-methods-ee' into 'master'

Use Project#full_name instead of name_with_namespace

Closes gitlab-ce#30786

See merge request gitlab-org/gitlab-ee!4879

app/views/projects/commits/_commit.html.haml

@@ -47,7 +47,7 @@
           #{ commit_text.html_safe }
         - if show_project_name
           %span.project_namespace
-            = project.name_with_namespace
+            = project.full_name
 
       .commit-actions.flex-row.hidden-xs
         - if request.xhr?

app/views/search/results/_blob.html.haml

@@ -16,7 +16,7 @@
           - if @project
             = file_name
           - else
-            #{project.name_with_namespace}:
+            #{project.full_name}:
             %i= file_name
     - if blob.data
       .file-content.code.term

app/views/search/results/_wiki_blob.html.haml

@@ -10,7 +10,7 @@
           - if @project
             = wiki_blob.basename
           - else
-            #{project.name_with_namespace}:
+            #{project.full_name}:
             %i= wiki_blob.basename
     .file-content.code.term
       = render 'shared/file_highlight', blob: wiki_blob, first_line_number: wiki_blob.startline

ee/app/helpers/audit_logs_helper.rb

@@ -18,7 +18,7 @@ module AuditLogsHelper
 
   def admin_project_dropdown_label(default_label)
     if @entity
-      @entity.name_with_namespace
+      @entity.full_name
     else
       default_label
     end

ee/app/views/projects/services/gitlab_slack_application/_help.html.haml

-- pretty_name = defined?(@project) ? @project.name_with_namespace : 'namespace / path'
+- pretty_name = defined?(@project) ? @project.full_name : 'namespace / path'
 - run_actions_text = "Perform common operations on GitLab project: #{pretty_name}"
 
 .well

ee/app/workers/elastic_batch_project_indexer_worker.rb

@@ -17,14 +17,14 @@ class ElasticBatchProjectIndexerWorker
   private
 
   def run_indexer(project)
-    logger.info "Indexing #{project.name_with_namespace} (ID=#{project.id})..."
+    logger.info "Indexing #{project.full_name} (ID=#{project.id})..."
 
     last_commit = project.index_status.try(:last_commit)
     Gitlab::Elastic::Indexer.new(project).run(last_commit)
 
-    logger.info "Indexing #{project.name_with_namespace} (ID=#{project.id}) is done!"
+    logger.info "Indexing #{project.full_name} (ID=#{project.id}) is done!"
   rescue => err
-    logger.warn("#{err.message} indexing #{project.name_with_namespace} (ID=#{project.id}), trace - #{err.backtrace}")
+    logger.warn("#{err.message} indexing #{project.full_name} (ID=#{project.id}), trace - #{err.backtrace}")
   end
 
   def build_relation(start, finish, update_index)

ee/lib/tasks/gitlab/elastic.rake

@@ -46,7 +46,7 @@ namespace :gitlab do
 
       projects.find_each do |project|
         unless project.wiki.empty?
-          puts "Indexing wiki of #{project.name_with_namespace}..."
+          puts "Indexing wiki of #{project.full_name}..."
 
           begin
             project.wiki.index_blobs

ee/spec/factories/geo/event_log.rb

@@ -60,7 +60,7 @@ FactoryBot.define do
 
     repository_storage_name { project.repository_storage }
     repository_storage_path { project.repository_storage_path }
-    deleted_path { project.path_with_namespace }
+    deleted_path { project.full_path }
     deleted_project_name { project.name }
   end
 

ee/spec/models/concerns/elastic/project_spec.rb

@@ -75,7 +75,7 @@ describe Project, elastic: true do
       )
     )
 
-    expected_hash['name_with_namespace'] = project.name_with_namespace
+    expected_hash['name_with_namespace'] = project.full_name
     expected_hash['path_with_namespace'] = project.full_path
 
     expect(project.as_indexed_json).to eq(expected_hash)