diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-17 14:26:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-17 14:26:23 +0000 |
| commit | 1d96dfc1ac99a8bff76e862bd8e475c716ac1df4 (patch) | |
| tree | 2b89c11d66d7d7e81e25d7bccac04d88b141b457 /app/models/blob.rb | |
| parent | 4f5e2bee2928fd60cca9e28fe9085ba3cd070813 (diff) | |
| parent | d0db4080260a7ee8b276b825d1624fcc8dca54cb (diff) | |
| download | gitlab-ce-1d96dfc1ac99a8bff76e862bd8e475c716ac1df4.tar.gz | |
Merge branch 'master' into 'dm-changelog-viewer'
# Conflicts:
# app/models/blob.rb
Diffstat (limited to 'app/models/blob.rb')
| -rw-r--r-- | app/models/blob.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index 744fe813250..a8b8f4937cc 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -41,7 +41,9 @@ class Blob < SimpleDelegator BlobViewer::RouteMap, BlobViewer::License, + BlobViewer::Contributing, BlobViewer::Changelog +>>>>>>> app/models/blob.rb ].freeze attr_reader :project |