diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-02 08:09:02 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-02 08:09:02 +0000 |
| commit | 2a0d38c03fa20979a92597fdff18989c2b8e106b (patch) | |
| tree | 3f067aeabeb3fb4011e1b49055f60fee12533bf2 | |
| parent | 254698d6b8628b5ce57597526d6b34f332c22903 (diff) | |
| parent | 6ab8275cd1554e1509e2e9bc996c73c1635446ed (diff) | |
| download | gitlab-ce-2a0d38c03fa20979a92597fdff18989c2b8e106b.tar.gz | |
Merge branch 'rs-icon-symlink' into 'master'
Check symlink mode as a String for file_type_icon_class
The file mode for a symlink just got changed in `gitlab_git`, see https://gitlab.com/gitlab-org/gitlab_git/commit/8ae14bb84b94a2ec15f8a639fb82f0f55c77ad69
See merge request !487
| -rw-r--r-- | app/helpers/icons_helper.rb | 2 | ||||
| -rw-r--r-- | spec/helpers/icons_helper_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index 187e21832f0..a9030729b48 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -40,7 +40,7 @@ module IconsHelper def file_type_icon_class(type, mode, name) if type == 'folder' icon_class = 'folder' - elsif mode == 0120000 + elsif mode == '120000' icon_class = 'share' else # Guess which icon to choose based on file extension. diff --git a/spec/helpers/icons_helper_spec.rb b/spec/helpers/icons_helper_spec.rb index 0b1cf07b7b0..c052981fe73 100644 --- a/spec/helpers/icons_helper_spec.rb +++ b/spec/helpers/icons_helper_spec.rb @@ -7,7 +7,7 @@ describe IconsHelper do end it 'returns share class' do - expect(file_type_icon_class('file', 0120000, 'link')).to eq 'share' + expect(file_type_icon_class('file', '120000', 'link')).to eq 'share' end it 'returns file-pdf-o class with .pdf' do |