diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-10-13 16:15:46 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-10-13 21:25:36 -0700 |
| commit | 27326ac62c9bef892ab0dcc255e6abc74573983d (patch) | |
| tree | cd15ab188f5004d8071022483e9f8879e19cea9d | |
| parent | 4127b357881fedbf903159e089cc0c9d99c37eff (diff) | |
| download | gitlab-ce-27326ac62c9bef892ab0dcc255e6abc74573983d.tar.gz | |
Associate Rakefile with Ruby icon in diffs
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52654
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-associate-rakefile-ruby.yml | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js b/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js index 9bca1993ccc..bffaa096210 100644 --- a/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js +++ b/app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js @@ -549,6 +549,7 @@ const fileNameIcons = { jenkinsfile: 'jenkins', 'firebase.json': 'firebase', '.firebaserc': 'firebase', + Rakefile: 'ruby', 'rollup.config.js': 'rollup', 'rollup.config.ts': 'rollup', 'rollup-config.js': 'rollup', @@ -583,7 +584,5 @@ const fileNameIcons = { }; export default function getIconForFile(name) { - return fileNameIcons[name] || - fileExtensionIcons[name ? name.split('.').pop() : ''] || - ''; + return fileNameIcons[name] || fileExtensionIcons[name ? name.split('.').pop() : ''] || ''; } diff --git a/changelogs/unreleased/sh-associate-rakefile-ruby.yml b/changelogs/unreleased/sh-associate-rakefile-ruby.yml new file mode 100644 index 00000000000..3e3fcb8d860 --- /dev/null +++ b/changelogs/unreleased/sh-associate-rakefile-ruby.yml @@ -0,0 +1,5 @@ +--- +title: Associate Rakefile with Ruby icon in diffs +merge_request: +author: +type: other |