diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-10-18 22:23:55 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-10-18 22:23:55 +0300 |
commit | 741374e80951f3253b164d4c0c7fc6ab7a459921 (patch) | |
tree | ee1e57112ae95b373edfb033d698643e955bf8a7 | |
parent | 5992168087ac1da42ac5c3add96db914eb8f2d16 (diff) | |
parent | 27326ac62c9bef892ab0dcc255e6abc74573983d (diff) |
Merge branch 'sh-associate-rakefile-ruby' into 'master'
Associate Rakefile with Ruby icon in diffs
Closes #52654
See merge request gitlab-org/gitlab-ce!22341
-rw-r--r-- | app/assets/javascripts/vue_shared/components/file_icon/file_icon_map.js | 1 | ||||
-rw-r--r-- | changelogs/unreleased/sh-associate-rakefile-ruby.yml | 5 |
2 files changed, 6 insertions, 0 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 19611b14be4..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', 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 |