Merge branch 'feat/add-section-headers-to-project-repo-buttons' into 'master'
Improve empty project overview See merge request gitlab-org/gitlab-ce!16617
This commit is contained in:
commit
a7a240177b
4 changed files with 22 additions and 13 deletions
|
@ -9,15 +9,15 @@
|
|||
|
||||
- else
|
||||
.row-content-block.second-block.center
|
||||
%h3.page-title
|
||||
%h4
|
||||
This project does not have a README yet
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
%p
|
||||
A
|
||||
%code README
|
||||
file contains information about other files in a repository and is commonly
|
||||
distributed with computer software, forming part of its documentation.
|
||||
GitLab will render it here instead of this message.
|
||||
%p
|
||||
We recommend you to
|
||||
= link_to "add a README", add_special_file_path(@project, file_name: 'README.md')
|
||||
file to the repository and GitLab will render it here instead of this message.
|
||||
= link_to "Add Readme", add_special_file_path(@project, file_name: 'README.md'), class: 'btn btn-new'
|
||||
|
|
|
@ -6,7 +6,10 @@
|
|||
%ul.dropdown-menu.dropdown-menu-align-right.project-home-dropdown
|
||||
- can_create_issue = can?(current_user, :create_issue, @project)
|
||||
- merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
|
||||
- can_create_snippet = can?(current_user, :create_snippet, @project)
|
||||
- can_create_project_snippet = can?(current_user, :create_project_snippet, @project)
|
||||
|
||||
- if can_create_issue || merge_project || can_create_project_snippet
|
||||
%li.dropdown-header= _('This project')
|
||||
|
||||
- if can_create_issue
|
||||
%li= link_to _('New issue'), new_project_issue_path(@project)
|
||||
|
@ -14,11 +17,11 @@
|
|||
- if merge_project
|
||||
%li= link_to _('New merge request'), project_new_merge_request_path(merge_project)
|
||||
|
||||
- if can_create_snippet
|
||||
- if can_create_project_snippet
|
||||
%li= link_to _('New snippet'), new_project_snippet_path(@project)
|
||||
|
||||
- if can_create_issue || merge_project || can_create_snippet
|
||||
%li.divider
|
||||
- if can?(current_user, :push_code, @project)
|
||||
%li.dropdown-header= _('This repository')
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
%li= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master')
|
||||
|
@ -31,5 +34,5 @@
|
|||
- continue_params = { to: project_new_blob_path(@project, @project.default_branch || 'master'),
|
||||
notice: edit_in_new_fork_notice,
|
||||
notice_now: edit_in_new_fork_notice_now }
|
||||
- fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
|
||||
- fork_path = project_forks_path(@project, namespace_key: current_user.namespace.id, continue: continue_params)
|
||||
%li= link_to _('New file'), fork_path, method: :post
|
||||
|
|
|
@ -6,8 +6,9 @@
|
|||
= render "home_panel"
|
||||
|
||||
.row-content-block.second-block.center
|
||||
%h3.page-title
|
||||
%h4
|
||||
The repository for this project is empty
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
%p
|
||||
If you already have files you can push them using command line instructions below.
|
||||
|
@ -28,8 +29,8 @@
|
|||
%p
|
||||
- link = link_to(s_('AutoDevOps|Auto DevOps (Beta)'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'))
|
||||
= s_('AutoDevOps|You can activate %{link_to_settings} for this project.').html_safe % { link_to_settings: link }
|
||||
%p
|
||||
= s_('AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
|
||||
%p= s_('AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
|
||||
%p= link_to _('New file'), project_new_blob_path(@project, @project.default_branch || 'master'), class: 'btn btn-new'
|
||||
|
||||
- if can?(current_user, :push_code, @project)
|
||||
%div{ class: container_class }
|
||||
|
@ -79,4 +80,4 @@
|
|||
|
||||
- if can? current_user, :remove_project, @project
|
||||
.prepend-top-20
|
||||
= link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
|
||||
= link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove pull-right"
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Improve empty project overview
|
||||
merge_request: 16617
|
||||
author: George Tsiolis
|
||||
type: added
|
Loading…
Reference in a new issue