Merge branch 'master' into change_modes_to_mimetypes

This commit is contained in:
Joshua Peek
2016-09-23 13:54:20 -07:00
6 changed files with 41 additions and 14 deletions

View File

@@ -267,6 +267,7 @@ module Linguist
# Returns an Array of Languages.
def self.ace_modes
warn "This method will be deprecated in a future 5.x release. Every language now has an `ace_mode` set."
warn caller
@ace_modes ||= all.select(&:ace_mode).sort_by { |lang| lang.name.downcase }
end
@@ -306,7 +307,7 @@ module Linguist
# Set legacy search term
@search_term = attributes[:search_term] || default_alias_name
# Set the language_id
# Set the language_id
@language_id = attributes[:language_id]
# Set extensions or default to [].