Merging upstream version 2.2.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

tests/identify_test.py

@@ -158,6 +158,8 @@ def test_tags_from_path_plist_text(tmpdir):
         ('Pipfile.lock', {'text', 'json'}),
         ('mod/test.py', {'text', 'python'}),
         ('mod/Dockerfile', {'text', 'dockerfile'}),
+        ('Gemfile', {'text', 'ruby'}),
+        ('Gemfile.lock', {'text'}),
 
         # does not set binary / text
         ('f.plist', {'plist'}),