Merge branch 'mr-origin-7855' into 'master'
Adds a default commit message when adding a README (#25167) Closes #25167 See merge request !7903
This commit is contained in:
commit
739e211187
4 changed files with 7 additions and 17 deletions
|
@ -391,20 +391,6 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def new_readme_path
|
||||
ref = @repository.root_ref if @repository
|
||||
ref ||= 'master'
|
||||
|
||||
namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'README.md')
|
||||
end
|
||||
|
||||
def new_license_path
|
||||
ref = @repository.root_ref if @repository
|
||||
ref ||= 'master'
|
||||
|
||||
namespace_project_new_blob_path(@project.namespace, @project, tree_join(ref), file_name: 'LICENSE')
|
||||
end
|
||||
|
||||
def readme_cache_key
|
||||
sha = @project.commit.try(:sha) || 'nil'
|
||||
[@project.path_with_namespace, sha, "readme"].join('-')
|
||||
|
|
|
@ -18,5 +18,5 @@
|
|||
distributed with computer software, forming part of its documentation.
|
||||
%p
|
||||
We recommend you to
|
||||
= link_to "add a README", new_readme_path, class: 'underlined-link'
|
||||
= link_to "add a README", add_special_file_path(@project, file_name: 'README.md'), class: 'underlined-link'
|
||||
file to the repository and GitLab will render it here instead of this message.
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
%p
|
||||
Otherwise you can start with adding a
|
||||
= succeed ',' do
|
||||
= link_to "README", new_readme_path, class: 'underlined-link'
|
||||
= link_to "README", add_special_file_path(@project, file_name: 'README.md'), class: 'underlined-link'
|
||||
a
|
||||
= succeed ',' do
|
||||
= link_to "LICENSE", add_special_file_path(@project, file_name: 'LICENSE'), class: 'underlined-link'
|
||||
|
|
4
changelogs/unreleased/mr-origin-7855.yml
Normal file
4
changelogs/unreleased/mr-origin-7855.yml
Normal file
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Provides a sensible default message when adding a README to a project
|
||||
merge_request: 7903
|
||||
author:
|
Loading…
Reference in a new issue