Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b1b8261f
Commit
b1b8261f
authored
Mar 17, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add license and contribution guide links to project sidebar.
parent
5adb1128
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
17 deletions
+65
-17
CHANGELOG
CHANGELOG
+1
-0
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+35
-2
app/models/repository.rb
app/models/repository.rb
+9
-1
app/views/projects/_issuable_form.html.haml
app/views/projects/_issuable_form.html.haml
+2
-2
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+16
-10
No files found.
CHANGELOG
View file @
b1b8261f
...
...
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- Add a service to support external wikis (Hannes Rosenögger)
- Add changelog, license and contribution guide links to project sidebar.
v 7.9.0 (unreleased)
- Add HipChat integration documentation (Stan Hu)
...
...
app/helpers/projects_helper.rb
View file @
b1b8261f
...
...
@@ -232,12 +232,45 @@ module ProjectsHelper
end
def
contribution_guide_url
(
project
)
if
project
&&
project
.
repository
.
contribution_guide
if
project
&&
contribution_guide
=
project
.
repository
.
contribution_guide
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
project
.
repository
.
contribution_guide
.
name
)
contribution_guide
.
name
)
)
end
end
def
changelog_url
(
project
)
if
project
&&
changelog
=
project
.
repository
.
changelog
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
changelog
.
name
)
)
end
end
def
license_url
(
project
)
if
project
&&
license
=
project
.
repository
.
license
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
license
.
name
)
)
end
end
def
version_url
(
project
)
if
project
&&
version
=
project
.
repository
.
version
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
project
.
default_branch
,
version
.
name
)
)
end
end
...
...
app/models/repository.rb
View file @
b1b8261f
...
...
@@ -122,7 +122,7 @@ class Repository
def
expire_cache
%i(size branch_names tag_names commit_count graph_log
readme version contribution_guide changelog)
.
each
do
|
key
|
readme version contribution_guide changelog
license
)
.
each
do
|
key
|
cache
.
expire
(
key
)
end
end
...
...
@@ -212,6 +212,14 @@ class Repository
end
end
def
license
cache
.
fetch
(
:license
)
do
tree
(
:head
).
blobs
.
find
do
|
file
|
file
.
name
=~
/^license/i
end
end
end
def
head_commit
commit
(
self
.
root_ref
)
end
...
...
app/views/projects/_issuable_form.html.haml
View file @
b1b8261f
...
...
@@ -71,10 +71,10 @@
=
link_to
'Create new label'
,
new_namespace_project_label_path
(
issuable
.
project
.
namespace
,
issuable
.
project
),
target: :blank
.form-actions
-
if
!
issuable
.
project
.
empty_repo?
&&
contribution_guide_url
(
issuable
.
project
)
&&
!
issuable
.
persisted?
-
if
!
issuable
.
project
.
empty_repo?
&&
(
guide_url
=
contribution_guide_url
(
issuable
.
project
)
)
&&
!
issuable
.
persisted?
%p
Please review the
%strong
#{
link_to
'guidelines for contribution'
,
contribution_guide_url
(
issuable
.
project
)
}
%strong
#{
link_to
'guidelines for contribution'
,
guide_url
}
to this repository.
-
if
issuable
.
new_record?
=
f
.
submit
"Submit new
#{
issuable
.
class
.
model_name
.
human
.
downcase
}
"
,
class:
'btn btn-create'
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
b1b8261f
...
...
@@ -69,10 +69,10 @@
=
link_to
'Create new label'
,
new_namespace_project_label_path
(
@merge_request
.
target_project
.
namespace
,
@merge_request
.
target_project
),
target: :blank
.form-actions
-
if
contribution_guide_url
(
@target_project
)
-
if
guide_url
=
contribution_guide_url
(
@target_project
)
%p
Please review the
%strong
#{
link_to
'guidelines for contribution'
,
contribution_guide_url
(
@target_project
)
}
%strong
#{
link_to
'guidelines for contribution'
,
guide_url
}
to this repository.
=
f
.
hidden_field
:source_project_id
=
f
.
hidden_field
:source_branch
...
...
app/views/projects/show.html.haml
View file @
b1b8261f
...
...
@@ -47,21 +47,27 @@
=
link_to
@project
.
forked_from_project
.
name_with_namespace
,
namespace_project_path
(
@project
.
namespace
,
@project
.
forked_from_project
)
-
unless
@project
.
empty_repo?
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
@ref
||
@repository
.
root_ref
),
class:
'btn btn-block'
do
Compare code
-
version
=
@repository
.
version
-
changelog
=
@repository
.
changelog
-
if
version
-
detail_file
=
changelog
.
try
(
:name
)
||
version
.
name
=
link_to
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
tree_join
(
@repository
.
root_ref
,
detail_file
)),
class:
'btn btn-block'
do
-
if
version
=
@repository
.
version
-
detail_url
=
changelog_url
(
@project
)
||
version_url
(
@project
)
=
link_to
detail_url
,
class:
'btn btn-block'
do
Version:
%span
.count
=
@repository
.
blob_by_oid
(
version
.
id
).
data
-
elsif
changelog
=
link_to
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
tree_join
(
@repository
.
root_ref
,
changelog
.
name
)
),
class:
'btn btn-block'
do
-
elsif
@repository
.
changelog
=
link_to
changelog_url
(
@project
),
class:
'btn btn-block'
do
View changelog
-
if
@repository
.
contribution_guide
=
link_to
contribution_guide_url
(
@project
),
class:
'btn btn-block'
do
View contribution guide
-
if
@repository
.
license
=
link_to
license_url
(
@project
),
class:
'btn btn-block'
do
View license
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
@ref
||
@repository
.
root_ref
),
class:
'btn btn-block'
do
Compare code
.prepend-top-10
%p
%span
.light
Created on
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment