diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-20 13:17:43 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2017-11-20 13:23:43 +0300 |
| commit | 2e66d4cae259673b8b1ccc9838aaaa689e7b903f (patch) | |
| tree | 67b2baaf3ffb1eee639b95ade5dbef7096ffb99c /app | |
| parent | 078764e4638b5b3d3c500c05d923e19a4a82b58c (diff) | |
Merge branch 'fix-conflict-highlighting' into 'master'
Fix conflict highlighting
See merge request gitlab-org/gitlab-ce!15463
(cherry picked from commit 202ab62874bb3d828ab48017550660d461e8cf6b)
64a9e53b Fix conflict highlighting
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index b7a5839f6cd..3a6afc117a6 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -994,10 +994,6 @@ class Repository raw_repository.ls_files(actual_ref) end - def gitattribute(path, name) - raw_repository.attributes(path)[name] - end - def copy_gitattributes(ref) actual_ref = ref || root_ref begin |