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
9f4fa4cd
Commit
9f4fa4cd
authored
May 11, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix displaying a repository without a readme
parent
e65d9326
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
app/models/repository.rb
app/models/repository.rb
+2
-2
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+13
-3
No files found.
app/models/repository.rb
View file @
9f4fa4cd
...
@@ -517,8 +517,8 @@ class Repository
...
@@ -517,8 +517,8 @@ class Repository
cache_method
:avatar
cache_method
:avatar
def
readme
def
readme
if
head
=
tree
(
:head
)
if
readme
=
tree
(
:head
)
&
.
readme
ReadmeBlob
.
new
(
head
.
readme
,
self
)
ReadmeBlob
.
new
(
readme
,
self
)
end
end
end
end
...
...
spec/models/repository_spec.rb
View file @
9f4fa4cd
...
@@ -1659,18 +1659,28 @@ describe Repository, models: true do
...
@@ -1659,18 +1659,28 @@ describe Repository, models: true do
describe
'#readme'
,
caching:
true
do
describe
'#readme'
,
caching:
true
do
context
'with a non-existing repository'
do
context
'with a non-existing repository'
do
it
'returns nil'
do
it
'returns nil'
do
expect
(
repository
).
to
receive
(
:tree
).
with
(
:head
).
and_return
(
nil
)
allow
(
repository
).
to
receive
(
:tree
).
with
(
:head
).
and_return
(
nil
)
expect
(
repository
.
readme
).
to
be_nil
expect
(
repository
.
readme
).
to
be_nil
end
end
end
end
context
'with an existing repository'
do
context
'with an existing repository'
do
context
'when no README exists'
do
it
'returns nil'
do
allow_any_instance_of
(
Tree
).
to
receive
(
:readme
).
and_return
(
nil
)
expect
(
repository
.
readme
).
to
be_nil
end
end
context
'when a README exists'
do
it
'returns the README'
do
it
'returns the README'
do
expect
(
repository
.
readme
).
to
be_an_instance_of
(
ReadmeBlob
)
expect
(
repository
.
readme
).
to
be_an_instance_of
(
ReadmeBlob
)
end
end
end
end
end
end
end
describe
'#expire_statistics_caches'
do
describe
'#expire_statistics_caches'
do
it
'expires the caches'
do
it
'expires the caches'
do
...
...
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