Merge branch 'master' into default_branch

jcouball · web-flow · commit f0300df5e532 · 2022-04-17T17:29:37.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,17 @@
 
 # Change Log
 
+## v1.11.0
+
+* 292087e Supress unneeded test output (#570)
+* 19dfe5e Add support for fetch options "--force/-f" and "--prune-tags/-P". (#563)
+* 018d919 Fix bug when grepping lines that contain numbers surrounded by colons (#566)
+* c04d16e remove from maintainer (#567)
+* 291ca09 Address command line injection in Git::Lib#fetch
+* 521b8e7 Release v1.10.2 (#561)
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.11.0
+
 ## v1.10.2
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.10.2
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,9 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-gemspec :name => 'git'
+git 'https://github.com/lsegal/yard', branch: 'main' do
+  gem 'yard'
+end
 
+gemspec name: 'git'
diff --git a/lib/git/version.rb b/lib/git/version.rb
@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.10.2'
+  VERSION='1.11.0'
 end
