Commit 1b54a8cd authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Replace deprecated name_with_namespace with full_name in app/views

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 86df5c67
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
%h4 Latest projects %h4 Latest projects
- @projects.each do |project| - @projects.each do |project|
%p %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 %span.light.pull-right
#{time_ago_with_tooltip(project.created_at)} #{time_ago_with_tooltip(project.created_at)}
.col-md-4 .col-md-4
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
- @projects.each do |project| - @projects.each do |project|
%li %li
%strong %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 %span.badge
= storage_counter(project.statistics.storage_size) = storage_counter(project.statistics.storage_size)
%span.pull-right.light %span.pull-right.light
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
- @group.shared_projects.sort_by(&:name).each do |project| - @group.shared_projects.sort_by(&:name).each do |project|
%li %li
%strong %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 %span.badge
= storage_counter(project.statistics.storage_size) = storage_counter(project.statistics.storage_size)
%span.pull-right.light %span.pull-right.light
......
- add_to_breadcrumbs "Projects", admin_projects_path - add_to_breadcrumbs "Projects", admin_projects_path
- breadcrumb_title @project.name_with_namespace - breadcrumb_title @project.full_name
- page_title @project.name_with_namespace, "Projects" - page_title @project.full_name, "Projects"
%h3.page-title %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 = link_to edit_project_path(@project), class: "btn btn-nr pull-right" do
%i.fa.fa-pencil-square-o %i.fa.fa-pencil-square-o
Edit Edit
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
%tr.alert-info %tr.alert-info
%td %td
%strong %strong
= project.name_with_namespace = project.full_name
%td %td
.pull-right .pull-right
= link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs' = link_to 'Disable', [:admin, project.namespace.becomes(Namespace), project, runner_project], method: :delete, class: 'btn btn-danger btn-xs'
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
- @projects.each do |project| - @projects.each do |project|
%tr %tr
%td %td
= project.name_with_namespace = project.full_name
%td %td
.pull-right .pull-right
= form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f| = form_for [:admin, project.namespace.becomes(Namespace), project, project.runner_projects.new] do |f|
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
%td.status %td.status
- if project - if project
= project.name_with_namespace = project.full_name
%td.build-link %td.build-link
- if project - if project
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
.panel.panel-default .panel.panel-default
.panel-heading Joined projects (#{@joined_projects.count}) .panel-heading Joined projects (#{@joined_projects.count})
%ul.well-list %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) - member = project.team.find_member(@user.id)
%li.project_member %li.project_member
.list-item-name .list-item-name
= link_to admin_project_path(project), class: dom_class(project) do = link_to admin_project_path(project), class: dom_class(project) do
= project.name_with_namespace = project.full_name
- if member - if member
.pull-right .pull-right
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.list-item-name .list-item-name
%span{ class: visibility_level_color(project.visibility_level) } %span{ class: visibility_level_color(project.visibility_level) }
= visibility_level_icon(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 .pull-right
- if project.archived - if project.archived
%span.label.label-warning archived %span.label.label-warning archived
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- project = @member.source - project = @member.source
project project
%strong %strong
= link_to project.name_with_namespace, project_url(project) = link_to project.full_name, project_url(project)
- when Group - when Group
- group = @member.source - group = @member.source
group group
......
- 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 .projects-dropdown-container
.project-dropdown-sidebar.qa-projects-dropdown-sidebar .project-dropdown-sidebar.qa-projects-dropdown-sidebar
%ul %ul
......
- page_title @project.name_with_namespace - page_title @project.full_name
- page_description @project.description unless page_description - page_description @project.description unless page_description
- header_title project_title(@project) unless header_title - header_title project_title(@project) unless header_title
- nav "project" - nav "project"
......
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
%p %p
The project export can be downloaded from: The project export can be downloaded from:
= link_to download_export_project_url(@project), rel: 'nofollow', download: '' do = link_to download_export_project_url(@project), rel: 'nofollow', download: '' do
= @project.name_with_namespace + " export" = @project.full_name + " export"
%p %p
The download link will expire in 24 hours. The download link will expire in 24 hours.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%p %p
The project is now located under The project is now located under
= link_to project_url(@project) do = link_to project_url(@project) do
= @project.name_with_namespace = @project.full_name
%p %p
To update the remote url in your local repository run (for ssh): To update the remote url in your local repository run (for ssh):
%p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" } %p{ style: "background: #f5f5f5; padding:10px; border:1px solid #ddd" }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%td %td
%strong %strong
- if can?(current_user, :read_project, project) - 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 - else
.light N/A .light N/A
%td %td
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
- if admin - if admin
%td %td
- if job.project - 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 %td
- if job.try(:runner) - if job.try(:runner)
= runner_link(job.runner) = runner_link(job.runner)
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
- if admin - if admin
%td %td
- if generic_commit_status.project - 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 %td
- if generic_commit_status.try(:runner) - if generic_commit_status.try(:runner)
= runner_link(generic_commit_status.runner) = runner_link(generic_commit_status.runner)
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
- unless @issue.project.id == merge_request.target_project.id - unless @issue.project.id == merge_request.target_project.id
in in
- project = merge_request.target_project - 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? - if merge_request.merged?
%span.merge-request-status.prepend-left-10.merged %span.merge-request-status.prepend-left-10.merged
......
- 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: %p To setup this service:
%ul.list-unstyled.indent-list %ul.list-unstyled.indent-list
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.form-group .form-group
= label_tag :display_name, 'Display name', class: 'col-sm-2 col-xs-12 control-label' = label_tag :display_name, 'Display name', class: 'col-sm-2 col-xs-12 control-label'
.col-sm-10.col-xs-12.input-group .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 .input-group-btn
= clipboard_button(target: '#display_name') = clipboard_button(target: '#display_name')
......
- 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}" - run_actions_text = "Perform common operations on GitLab project: #{pretty_name}"
.well .well
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%span.dropdown-toggle-text %span.dropdown-toggle-text
Project: Project:
- if @project.present? - if @project.present?
= @project.name_with_namespace = @project.full_name
- else - else
Any Any
= icon("chevron-down") = icon("chevron-down")
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= search_entries_info(@search_objects, @scope, @search_term) = search_entries_info(@search_objects, @scope, @search_term)
- unless @show_snippets - unless @show_snippets
- if @project - 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 - elsif @group
in group #{link_to @group.name, @group} in group #{link_to @group.name, @group}
......
...@@ -10,4 +10,4 @@ ...@@ -10,4 +10,4 @@
.description.term .description.term
= search_md_sanitize(issue, :description) = search_md_sanitize(issue, :description)
%span.light %span.light
#{issue.project.name_with_namespace} #{issue.project.full_name}
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
.description.term .description.term
= search_md_sanitize(merge_request, :description) = search_md_sanitize(merge_request, :description)
%span.light %span.light
#{merge_request.project.name_with_namespace} #{merge_request.project.full_name}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%i.fa.fa-comment %i.fa.fa-comment
= link_to_member(project, note.author, avatar: false) = link_to_member(project, note.author, avatar: false)
commented on commented on
= link_to project.name_with_namespace, project = link_to project.full_name, project
&middot; &middot;
- if note.for_commit? - if note.for_commit?
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%small.pull-right.cgray %small.pull-right.cgray
- if snippet_title.project_id? - 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-info
= snippet_title.to_reference = snippet_title.to_reference
......
- noteable = @sent_notification.noteable - noteable = @sent_notification.noteable
- noteable_type = @sent_notification.noteable_type.titleize.downcase - noteable_type = @sent_notification.noteable_type.titleize.downcase
- noteable_text = %(#{noteable.title} (#{noteable.to_reference})) - 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 %h3.page-title
Unsubscribe from #{noteable_type} Unsubscribe from #{noteable_type}
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- if show_project_name - if show_project_name
%strong #{project.name} &middot; %strong #{project.name} &middot;
- elsif show_full_project_name - elsif show_full_project_name
%strong #{project.name_with_namespace} &middot; %strong #{project.full_name} &middot;
- if issuable.is_a?(Issue) - if issuable.is_a?(Issue)
= confidential_icon(issuable) = confidential_icon(issuable)
= link_to issuable.title, issuable_url_args, title: issuable.title = link_to issuable.title, issuable_url_args, title: issuable.title
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
- milestone.milestones.each do |milestone| - milestone.milestones.each do |milestone|
= link_to milestone_path(milestone) do = link_to milestone_path(milestone) do
%span.label.label-gray %span.label.label-gray
= dashboard ? milestone.project.name_with_namespace : milestone.project.name = dashboard ? milestone.project.full_name : milestone.project.name
- if @group - if @group
.col-sm-6.milestone-actions .col-sm-6.milestone-actions
- if can?(current_user, :admin_milestones, @group) - if can?(current_user, :admin_milestones, @group)
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
- milestone.milestones.each do |ms| - milestone.milestones.each do |ms|
%tr %tr
%td %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) = link_to project_name, project_milestone_path(ms.project, ms)
%td %td
= ms.issues_visible_to_user(current_user).opened.count = ms.issues_visible_to_user(current_user).opened.count
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
%span.hidden-xs %span.hidden-xs
in in
= link_to project_path(snippet.project) do = link_to project_path(snippet.project) do
= snippet.project.name_with_namespace = snippet.project.full_name
.pull-right.snippet-updated-at .pull-right.snippet-updated-at
%span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom')} %span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom')}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment