diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-05-10 18:57:19 +0000 |
| commit | 9c7d87ef0ec941b389cb5ef57a07ff0f43909305 (patch) | |
| tree | 827aaf4dbb628eb31517aaf2960814a521430229 /app/models/repository.rb | |
| parent | 1e0df21a74017deb780023ed83f04dbbeed13899 (diff) | |
| parent | 180ec7113e358a7f8388e1436dc0670a11ba68df (diff) | |
| download | gitlab-ce-docs/hide-gcp-install.tar.gz | |
Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-install
# Conflicts:
# doc/install/README.md
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 0c797dd5814..0c36a9e8762 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -518,7 +518,7 @@ class Repository def readme if head = tree(:head) - head.readme + ReadmeBlob.new(head.readme, self) end end |