Prepare 1.2.0 release

rubyconfig · May 12, 2016 · 8e25353 · 8e25353
1 parent 0797b6a
commit 8e25353
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## Latest changes
+## 1.2.0
 
+* Add ability to load settings from ENV variables ([#108](https://github.com/railsconfig/config/issues/108) thanks @vinceve and @spalladino)
 * Removed Rails 5 deprecation warnings for prepend_before_filter ([#141](https://github.com/railsconfig/config/pull/141)
 
 ## 1.1.1

diff --git a/README.md b/README.md
@@ -23,15 +23,15 @@ Config helps you easily manage environment specific settings in an easy and usab
 ## Compatibility
 
 * Ruby `2.x`
-* Rails `>= 3.1` and `4`
+* Rails `>= 3.1`, `4` and `5`
 * Padrino
 * Sinatra
 
 For older versions of Rails or Ruby use [AppConfig](http://github.com/fredwu/app_config).
 
 ## Installing
 
-### Installing on Rails 3 or 4
+### Installing on Rails 3, 4 or 5
 
 Add `gem 'config'` to your `Gemfile` and run `bundle install` to install it. Then run
 
@@ -370,8 +370,8 @@ mdl --style .mdlstyle.rb *.md
 
 ## Authors
 
-* [Fred Wu](http://github.com/fredwu)
 * [Piotr Kuczynski](http://github.com/pkuczynski)
+* [Fred Wu](http://github.com/fredwu)
 * [Jacques Crocker](http://github.com/railsjedi)
 * Inherited from [AppConfig](http://github.com/cjbottaro/app_config) by [Christopher J. Bottaro](http://github.com/cjbottaro)
 

diff --git a/config.gemspec b/config.gemspec
@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.name             = 'config'
   s.version          = Config::VERSION
   s.date             = Time.now.strftime '%F'
-  s.authors          = ['Jacques Crocker', 'Fred Wu', 'Piotr Kuczynski']
-  s.email            = %w(railsjedi@gmail.com ifredwu@gmail.com piotr.kuczynski@gmail.com)
+  s.authors          = ['Piotr Kuczynski', 'Fred Wu', 'Jacques Crocker']
+  s.email            = %w(piotr.kuczynski@gmail.com ifredwu@gmail.com railsjedi@gmail.com)
   s.summary          = 'Effortless multi-environment settings in Rails, Sinatra, Pandrino and others'
   s.description      = 'Easiest way to manage multi-environment settings in any ruby project or framework: Rails, Sinatra, Pandrino and others'
   s.homepage         = 'https://github.com/railsconfig/config'

diff --git a/lib/config/version.rb b/lib/config/version.rb
@@ -1,3 +1,3 @@
 module Config
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end