diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-03-30 12:25:53 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-03-30 12:25:53 +0000 |
| commit | 1246b9c1c53567293e57f0b4b7a16d2a5eb9d9d0 (patch) | |
| tree | 44c13196568f54e89b183cedf740fdf03ac13c3b /app | |
| parent | 80b475d5a045c91aca7df87f65406222f13b6137 (diff) | |
| parent | bb853779761d07a6aa7ba38cefbaa2128db0fd4b (diff) | |
| download | gitlab-ce-1246b9c1c53567293e57f0b4b7a16d2a5eb9d9d0.tar.gz | |
Merge branch 'fix/projects-no-repository-placeholder' into 'master'
Update no repository placeholder
See merge request gitlab-org/gitlab-ce!17964
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/no_repo.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 7f9486d08d9..8e1dea4afc1 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- breadcrumb_title "Details" +- breadcrumb_title _("Details") - can_create_subgroups = can?(current_user, :create_subgroup, @group) = content_for :meta_tags do diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 8a36fada389..b15fe514a08 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- breadcrumb_title "Details" +- breadcrumb_title _("Details") = render partial: 'flash_messages', locals: { project: @project } diff --git a/app/views/projects/no_repo.html.haml b/app/views/projects/no_repo.html.haml index ba5845877e5..14d880028c7 100644 --- a/app/views/projects/no_repo.html.haml +++ b/app/views/projects/no_repo.html.haml @@ -1,3 +1,5 @@ +- breadcrumb_title _("Details") + %h2 %i.fa.fa-warning #{ _('No repository') } @@ -10,7 +12,7 @@ .no-repo-actions = link_to project_repository_path(@project), method: :post, class: 'btn btn-primary' do - #{ _('Create empty bare repository') } + #{ _('Create empty repository') } %strong.prepend-left-10.append-right-10 or @@ -19,4 +21,4 @@ - if can? current_user, :remove_project, @project .prepend-top-20 - = link_to _('Remove project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right" + = link_to _('Remove project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove pull-right" diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index fa281327eb7..94331a16abd 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- breadcrumb_title "Details" +- breadcrumb_title _("Details") - @content_class = "limit-container-width" unless fluid_layout - show_auto_devops_callout = show_auto_devops_callout?(@project) |