Replace deprecated name_with_namespace with full_name in app/views

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-03-05 15:45:35 +02:00 · 2018-03-05 15:45:35 +02:00 · 1b54a8cdda
commit 1b54a8cdda
parent 86df5c6793
28 changed files with 35 additions and 35 deletions
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@ -164,7 +164,7 @@
            %h4 Latest projects
            - @projects.each do |project|
              %p
-                = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
+                = link_to project.full_name, [:admin, project.namespace.becomes(Namespace), project], class: 'str-truncated-60'
                %span.light.pull-right
                  #{time_ago_with_tooltip(project.created_at)}
      .col-md-4
--- a/app/views/admin/groups/show.html.haml
+++ b/app/views/admin/groups/show.html.haml
@ -68,7 +68,7 @@
        - @projects.each do |project|
          %li
            %strong
-              = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
+              = link_to project.full_name, [:admin, project.namespace.becomes(Namespace), project]
              %span.badge
                = storage_counter(project.statistics.storage_size)
            %span.pull-right.light
@ -86,7 +86,7 @@
          - @group.shared_projects.sort_by(&:name).each do |project|
            %li
              %strong
-                = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
+                = link_to project.full_name, [:admin, project.namespace.becomes(Namespace), project]
                %span.badge
                  = storage_counter(project.statistics.storage_size)
              %span.pull-right.light
--- a/app/views/admin/projects/show.html.haml
+++ b/app/views/admin/projects/show.html.haml
@ -1,8 +1,8 @@
 - add_to_breadcrumbs "Projects", admin_projects_path
- breadcrumb_title @project.name_with_namespace
- page_title @project.name_with_namespace, "Projects"
+- breadcrumb_title @project.full_name
+- page_title @project.full_name, "Projects"
 %h3.page-title
-  Project: #{@project.name_with_namespace}
+  Project: #{@project.full_name}
  = link_to edit_project_path(@project), class: "btn btn-nr pull-right" do
    %i.fa.fa-pencil-square-o
    Edit
--- a/app/views/admin/runners/show.html.haml
+++ b/app/views/admin/runners/show.html.haml
@ -39,7 +39,7 @@
            %tr.alert-info
              %td
                %strong
-                  = project.name_with_namespace
+                  = project.full_name
              %td
                .pull-right
                  = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
@ -61,7 +61,7 @@
      - @projects.each do |project|
        %tr
          %td
-            = project.name_with_namespace
+            = project.full_name
          %td
            .pull-right
              = form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
@ -95,7 +95,7 @@

          %td.status
            - if project
-              = project.name_with_namespace
+              = project.full_name

          %td.build-link
            - if project
--- a/app/views/admin/users/projects.html.haml
+++ b/app/views/admin/users/projects.html.haml
@ -29,12 +29,12 @@
    .panel.panel-default
      .panel-heading Joined projects (#{@joined_projects.count})
      %ul.well-list
-        - @joined_projects.sort_by(&:name_with_namespace).each do |project|
+        - @joined_projects.sort_by(&:full_name).each do |project|
          - member = project.team.find_member(@user.id)
          %li.project_member
            .list-item-name
              = link_to admin_project_path(project), class: dom_class(project) do
-                = project.name_with_namespace
+                = project.full_name

            - if member
              .pull-right
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@ -14,7 +14,7 @@
        .list-item-name
          %span{ class: visibility_level_color(project.visibility_level) }
            = visibility_level_icon(project.visibility_level)
-          %strong= link_to project.name_with_namespace, project
+          %strong= link_to project.full_name, project
        .pull-right
          - if project.archived
            %span.label.label-warning archived
--- a/app/views/invites/show.html.haml
+++ b/app/views/invites/show.html.haml
@ -12,7 +12,7 @@
    - project = @member.source
    project
    %strong
-      = link_to project.name_with_namespace, project_url(project)
+      = link_to project.full_name, project_url(project)
  - when Group
    - group = @member.source
    group
--- a/app/views/layouts/nav/projects_dropdown/_show.html.haml
+++ b/app/views/layouts/nav/projects_dropdown/_show.html.haml
@ -1,4 +1,4 @@
- project_meta = { id: @project.id, name: @project.name, namespace: @project.name_with_namespace, web_url: project_path(@project), avatar_url: @project.avatar_url } if @project&.persisted?
+- project_meta = { id: @project.id, name: @project.name, namespace: @project.full_name, web_url: project_path(@project), avatar_url: @project.avatar_url } if @project&.persisted?
 .projects-dropdown-container
  .project-dropdown-sidebar.qa-projects-dropdown-sidebar
    %ul
--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@ -1,4 +1,4 @@
- page_title       @project.name_with_namespace
+- page_title       @project.full_name
 - page_description @project.description    unless page_description
 - header_title     project_title(@project) unless header_title
 - nav              "project"
--- a/app/views/notify/project_was_exported_email.html.haml
+++ b/app/views/notify/project_was_exported_email.html.haml
@ -3,6 +3,6 @@
 %p
  The project export can be downloaded from:
  = link_to download_export_project_url(@project), rel: 'nofollow', download: '' do
-    = @project.name_with_namespace + " export"
+    = @project.full_name + " export"
 %p
  The download link will expire in 24 hours.
--- a/app/views/notify/project_was_moved_email.html.haml
+++ b/app/views/notify/project_was_moved_email.html.haml
@ -3,7 +3,7 @@
 %p
  The project is now located under
  = link_to project_url(@project) do
-    = @project.name_with_namespace
+    = @project.full_name
 %p
  To update the remote url in your local repository run (for ssh):
 %p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
--- a/app/views/profiles/chat_names/_chat_name.html.haml
+++ b/app/views/profiles/chat_names/_chat_name.html.haml
@ -4,7 +4,7 @@
  %td
    %strong
      - if can?(current_user, :read_project, project)
-        = link_to project.name_with_namespace, project_path(project)
+        = link_to project.full_name, project_path(project)
      - else
        .light N/A
  %td
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@ -63,7 +63,7 @@
  - if admin
    %td
      - if job.project
-        = link_to job.project.name_with_namespace, admin_project_path(job.project)
+        = link_to job.project.full_name, admin_project_path(job.project)
    %td
      - if job.try(:runner)
        = runner_link(job.runner)
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@ -53,7 +53,7 @@
  - if admin
    %td
      - if generic_commit_status.project
-        = link_to generic_commit_status.project.name_with_namespace, admin_project_path(generic_commit_status.project)
+        = link_to generic_commit_status.project.full_name, admin_project_path(generic_commit_status.project)
    %td
      - if generic_commit_status.try(:runner)
        = runner_link(generic_commit_status.runner)
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@ -18,7 +18,7 @@
          - unless @issue.project.id == merge_request.target_project.id
            in
            - project = merge_request.target_project
-            = link_to project.name_with_namespace, project_path(project)
+            = link_to project.full_name, project_path(project)

        - if merge_request.merged?
          %span.merge-request-status.prepend-left-10.merged
--- a/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
+++ b/app/views/projects/services/mattermost_slash_commands/_detailed_help.html.haml
@ -1,4 +1,4 @@
- run_actions_text = "Perform common operations on GitLab project: #{@project.name_with_namespace}"
+- run_actions_text = "Perform common operations on GitLab project: #{@project.full_name}"

 %p To setup this service:
 %ul.list-unstyled.indent-list
@ -20,7 +20,7 @@
  .form-group
    = label_tag :display_name, 'Display name', class: 'col-sm-2 col-xs-12 control-label'
    .col-sm-10.col-xs-12.input-group
-      = text_field_tag :display_name, "GitLab / #{@project.name_with_namespace}", class: 'form-control input-sm', readonly: 'readonly'
+      = text_field_tag :display_name, "GitLab / #{@project.full_name}", class: 'form-control input-sm', readonly: 'readonly'
      .input-group-btn
        = clipboard_button(target: '#display_name')

--- a/app/views/projects/services/slack_slash_commands/_help.html.haml
+++ b/app/views/projects/services/slack_slash_commands/_help.html.haml
@ -1,4 +1,4 @@
- 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
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@ -22,7 +22,7 @@
    %span.dropdown-toggle-text
      Project:
      - if @project.present?
-        = @project.name_with_namespace
+        = @project.full_name
      - else
        Any
    = icon("chevron-down")
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@ -6,7 +6,7 @@
      = search_entries_info(@search_objects, @scope, @search_term)
    - unless @show_snippets
      - if @project
-        in project #{link_to @project.name_with_namespace, [@project.namespace.becomes(Namespace), @project]}
+        in project #{link_to @project.full_name, [@project.namespace.becomes(Namespace), @project]}
      - elsif @group
        in group #{link_to @group.name, @group}

--- a/app/views/search/results/_issue.html.haml
+++ b/app/views/search/results/_issue.html.haml
@ -10,4 +10,4 @@
    .description.term
      = search_md_sanitize(issue, :description)
  %span.light
-    #{issue.project.name_with_namespace}
+    #{issue.project.full_name}
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@ -11,4 +11,4 @@
    .description.term
      = search_md_sanitize(merge_request, :description)
  %span.light
-    #{merge_request.project.name_with_namespace}
+    #{merge_request.project.full_name}
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@ -7,7 +7,7 @@
    %i.fa.fa-comment
    = link_to_member(project, note.author, avatar: false)
    commented on
-    = link_to project.name_with_namespace, project
+    = link_to project.full_name, project
    &middot;

    - if note.for_commit?
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@ -11,7 +11,7 @@

  %small.pull-right.cgray
    - if snippet_title.project_id?
-      = link_to snippet_title.project.name_with_namespace, project_path(snippet_title.project)
+      = link_to snippet_title.project.full_name, project_path(snippet_title.project)

  .snippet-info
    = snippet_title.to_reference
--- a/app/views/sent_notifications/unsubscribe.html.haml
+++ b/app/views/sent_notifications/unsubscribe.html.haml
@ -1,7 +1,7 @@
 - noteable = @sent_notification.noteable
 - noteable_type = @sent_notification.noteable_type.titleize.downcase
 - noteable_text = %(#{noteable.title} (#{noteable.to_reference}))
- page_title "Unsubscribe", noteable_text, noteable_type.pluralize, @sent_notification.project.name_with_namespace
+- page_title "Unsubscribe", noteable_text, noteable_type.pluralize, @sent_notification.project.full_name

 %h3.page-title
  Unsubscribe from #{noteable_type}
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
@ -12,7 +12,7 @@
    - if show_project_name
      %strong #{project.name} &middot;
    - elsif show_full_project_name
-      %strong #{project.name_with_namespace} &middot;
+      %strong #{project.full_name} &middot;
    - if issuable.is_a?(Issue)
      = confidential_icon(issuable)
    = link_to issuable.title, issuable_url_args, title: issuable.title
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@ -27,7 +27,7 @@
            - milestone.milestones.each do |milestone|
              = link_to milestone_path(milestone) do
                %span.label.label-gray
-                  = dashboard ? milestone.project.name_with_namespace : milestone.project.name
+                  = dashboard ? milestone.project.full_name : milestone.project.name
      - if @group
        .col-sm-6.milestone-actions
          - if can?(current_user, :admin_milestones, @group)
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
@ -56,7 +56,7 @@
      - milestone.milestones.each do |ms|
        %tr
          %td
-            - project_name = group ? ms.project.name : ms.project.name_with_namespace
+            - project_name = group ? ms.project.name : ms.project.full_name
            = link_to project_name, project_milestone_path(ms.project, ms)
          %td
            = ms.issues_visible_to_user(current_user).opened.count
--- a/app/views/shared/snippets/_snippet.html.haml
+++ b/app/views/shared/snippets/_snippet.html.haml
@ -31,7 +31,7 @@
      %span.hidden-xs
        in
        = link_to project_path(snippet.project) do
-          = snippet.project.name_with_namespace
+          = snippet.project.full_name

    .pull-right.snippet-updated-at
      %span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom')}