Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gemfile and Gemfile.lock associated to Bundler icon #323

Merged
merged 1 commit into from
Sep 18, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Change Log

## 2.0.6 (September 18, 2016)
- Enhancement: Gemfile and Gemfile.lock associated to Bundler icon. ([@robertohuertasm](https://github.com/robertohuertasm) in [#323](https://github.com/robertohuertasm/vscode-icons/pull/323))
- Enhancement: Gemfile and .gemspec support for the official api. ([@robertohuertasm](https://github.com/robertohuertasm) in [#322](https://github.com/robertohuertasm/vscode-icons/pull/322))
- Enhancement: More webpack extensions added to support official api. ([@robertohuertasm](https://github.com/robertohuertasm) in [#320](https://github.com/robertohuertasm/vscode-icons/pull/320))
- .xliff support. ([@aalaap](https://github.com/aalaap) in [#317](https://github.com/robertohuertasm/vscode-icons/pull/317))
Expand Down
7 changes: 5 additions & 2 deletions icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
"_f_bower": {
"iconPath": "./icons/file_type_bower@2x.png"
},
"_f_bundler": {
"iconPath": "./icons/file_type_bundler@2x.png"
},
"_f_c++": {
"iconPath": "./icons/file_type_c++@2x.png"
},
Expand Down Expand Up @@ -858,6 +861,8 @@
"fileNames": {
"appveyor.yml": "_f_appveyor",
"bower.json": "_f_bower",
"gemfile": "_f_bundler",
"gemfile.lock": "_f_bundler",
"codeclimate.yml": "_f_codeclimate",
"makefile": "_f_config",
"composer.json": "_f_composer",
Expand Down Expand Up @@ -891,8 +896,6 @@
"paket.template": "_f_paket",
"paket.local": "_f_paket",
"phpunit.xml": "_f_phpunit",
"gemfile": "_f_ruby",
"gemfile.lock": "_f_ruby",
"stylelint.config.js": "_f_stylelint",
".travis.yml": "_f_travis",
"vscodeignore.json": "_f_vscode",
Expand Down
Binary file modified icons.zip
Binary file not shown.
Binary file added icons/file_type_bundler@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/icon.psd
Binary file not shown.
4 changes: 2 additions & 2 deletions src/build/supportedExtensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ exports.extensions = {
{ icon: 'blade', extensions: ['.blade.php'], special: 'php', contribOrder: 1 },
{ icon: 'bower', extensions: ['bowerrc'] },
{ icon: 'bower', extensions: ['bower.json'], special: 'json', contribType: ctype.filename },
{ icon: 'bundler', extensions: ['gemfile'], contribType: ctype.filename },
{ icon: 'bundler', extensions: ['gemfile.lock'], special: 'lock', contribType: ctype.filename },
{ icon: 'c++', extensions: ['cpp', 'hpp', 'cc', 'cxx'] },
{ icon: 'c', extensions: ['c'] },
{ icon: 'cake', extensions: ['cake'] },
Expand Down Expand Up @@ -138,8 +140,6 @@ exports.extensions = {
{ icon: 'riot', extensions: ['tag'] },
{ icon: 'robotframework', extensions: ['robot'] },
{ icon: 'ruby', extensions: ['rb', 'gemspec'] },
{ icon: 'ruby', extensions: ['gemfile'], contribType: ctype.filename },
{ icon: 'ruby', extensions: ['gemfile.lock'], special: 'lock', contribType: ctype.filename },
{ icon: 'rust', extensions: ['rs'] },
{ icon: 'sass', extensions: ['sass'] },
{ icon: 'scala', extensions: ['scala'] },
Expand Down
2 changes: 1 addition & 1 deletion src/dev/replacements.js

Large diffs are not rendered by default.