Merge pull request #365 from bkeepers/release-2.6.0

Release version 2.6.0, update Changelog
bkeepers · Jan 5, 2019 · 6fbf71f · 6fbf71f
2 parents 197c2ff + d4db5f1
commit 6fbf71f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,8 +9,8 @@ rvm:
  - 2.0.0
 
 before_install:
- - gem update --remote bundler
- - gem update --system
+ - 'gem update --system --conservative || (gem i "rubygems-update:~>2.7" --no-document && update_rubygems)'
+ - 'gem update bundler --conservative'
 
 sudo: false
 

diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,13 @@
 # Changelog
 
-[Unreleased changes](https:/bkeepers/dotenv/compare/v2.5.0...master)
+[Unreleased changes](https:/bkeepers/dotenv/compare/v2.6.0...master)
+
+## 2.6.0 - January 5, 2019
+
+* Added require keys method to raise if not defined ([#354](https:/bkeepers/dotenv/pull/354))
+* Use latest Ruby version on CI ([#356](https:/bkeepers/dotenv/pull/356), [#363](https:/bkeepers/dotenv/pull/363))
+* Clarify variable hierarchy in README.md ([#358](https:/bkeepers/dotenv/pull/358))
+* Use SVG Travis CI badge ([#360](https:/bkeepers/dotenv/pull/360))
 
 ## 2.5.0 - June 21, 2018
 

diff --git a/lib/dotenv/version.rb b/lib/dotenv/version.rb
@@ -1,3 +1,3 @@
 module Dotenv
- VERSION = "2.5.0".freeze
+ VERSION = "2.6.0".freeze
 end