Merge branch 'master' into dependabot/bundler/octokit-gte-4.8-and-lt-…

…4.14
licensee · Jan 10, 2019 · 9a5cbc1 · 9a5cbc1
2 parents b0cd63d + 13fdae1
commit 9a5cbc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -28,6 +28,6 @@ branch_protection:
   required_status_checks:
     strict: true
     contexts:
-      - "Travis CI - Pull Request"
+      - "continuous-integration/travis-ci"
   required_pull_request_reviews:
     require_code_owner_reviews: true
diff --git a/lib/licensee/license.rb b/lib/licensee/license.rb
@@ -23,6 +23,7 @@ def all(options = {})
           output = licenses.dup
           output.reject!(&:hidden?) unless options[:hidden]
           output.reject!(&:pseudo_license?) unless options[:pseudo]
+          output.sort_by!(&:key)
           return output if options[:featured].nil?
 
           output.select { |l| l.featured? == options[:featured] }