Merge branch 'add-license'
This commit is contained in:
commit
cc4405db7d
5 changed files with 69 additions and 8 deletions
|
@ -25,6 +25,7 @@ v 7.14.0 (unreleased)
|
|||
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
|
||||
- Add fetch command to the MR page.
|
||||
- Add ability to manage user email addresses via the API.
|
||||
- Show buttons to add license, changelog and contribution guide if they're missing.
|
||||
- Disabled autocapitalize and autocorrect on login field (Daryl Chan)
|
||||
- Mention group and project name in creation, update and deletion notices (Achilleas Pipinellis)
|
||||
- Remove redis-store TTL monkey patch
|
||||
|
|
|
@ -297,6 +297,15 @@ table.table.protected-branches-list tr.no-border {
|
|||
ul.nav-pills { display:inline-block; }
|
||||
li { display:inline; }
|
||||
a { float:left; }
|
||||
|
||||
li.missing a {
|
||||
color: #bbb;
|
||||
border: 1px dashed #ccc;
|
||||
|
||||
&:hover {
|
||||
background-color: #FAFAFA;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pre.light-well {
|
||||
|
|
|
@ -184,7 +184,43 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def contribution_guide_url(project)
|
||||
def add_contribution_guide_path(project)
|
||||
if project && !project.repository.contribution_guide
|
||||
namespace_project_new_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
project.default_branch,
|
||||
file_name: "CONTRIBUTING.md",
|
||||
commit_message: "Add contribution guide"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def add_changelog_path(project)
|
||||
if project && !project.repository.changelog
|
||||
namespace_project_new_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
project.default_branch,
|
||||
file_name: "CHANGELOG",
|
||||
commit_message: "Add changelog"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def add_license_path(project)
|
||||
if project && !project.repository.license
|
||||
namespace_project_new_blob_path(
|
||||
project.namespace,
|
||||
project,
|
||||
project.default_branch,
|
||||
file_name: "LICENSE",
|
||||
commit_message: "Add license"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def contribution_guide_path(project)
|
||||
if project && contribution_guide = project.repository.contribution_guide
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
|
@ -195,7 +231,7 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def changelog_url(project)
|
||||
def changelog_path(project)
|
||||
if project && changelog = project.repository.changelog
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
|
@ -206,7 +242,7 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def license_url(project)
|
||||
def license_path(project)
|
||||
if project && license = project.repository.license
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
|
@ -217,7 +253,7 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def version_url(project)
|
||||
def version_path(project)
|
||||
if project && version = project.repository.version
|
||||
namespace_project_blob_path(
|
||||
project.namespace,
|
||||
|
|
|
@ -22,19 +22,34 @@
|
|||
%li
|
||||
= link_to namespace_project_tags_path(@project.namespace, @project) do
|
||||
= pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
|
||||
|
||||
- if @repository.changelog
|
||||
%li
|
||||
= link_to changelog_url(@project) do
|
||||
= link_to changelog_path(@project) do
|
||||
Changelog
|
||||
- if @repository.license
|
||||
%li
|
||||
= link_to license_url(@project) do
|
||||
= link_to license_path(@project) do
|
||||
License
|
||||
- if @repository.contribution_guide
|
||||
%li
|
||||
= link_to contribution_guide_url(@project) do
|
||||
= link_to contribution_guide_path(@project) do
|
||||
Contribution guide
|
||||
|
||||
- if current_user && can_push_branch?(@project, @project.default_branch)
|
||||
- unless @repository.changelog
|
||||
%li.missing
|
||||
= link_to add_changelog_path(@project) do
|
||||
Add Changelog
|
||||
- unless @repository.license
|
||||
%li.missing
|
||||
= link_to add_license_path(@project) do
|
||||
Add License
|
||||
- unless @repository.contribution_guide
|
||||
%li.missing
|
||||
= link_to add_contribution_guide_path(@project) do
|
||||
Add Contribution guide
|
||||
|
||||
- if @project.archived?
|
||||
.text-warning.center.prepend-top-20
|
||||
%p
|
||||
|
|
|
@ -100,7 +100,7 @@
|
|||
= link_to 'Change branches', mr_change_branches_path(@merge_request)
|
||||
|
||||
.form-actions
|
||||
- if !issuable.project.empty_repo? && (guide_url = contribution_guide_url(issuable.project)) && !issuable.persisted?
|
||||
- if !issuable.project.empty_repo? && (guide_url = contribution_guide_path(issuable.project)) && !issuable.persisted?
|
||||
%p
|
||||
Please review the
|
||||
%strong #{link_to 'guidelines for contribution', guide_url}
|
||||
|
|
Loading…
Reference in a new issue