diff --git a/CHANGELOG.md b/CHANGELOG.md index 50dedf2..b7d3448 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.1 (2016/2/20) + +* Fix overlapping migration timestamp [#17](https://github.com/sungwoncho/has_friendship/pull/17) + ## 0.1.0 (2015/12/5) * Rails 4.x support (#11) diff --git a/Gemfile.lock b/Gemfile.lock index 036547a..7c5e3bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - has_friendship (0.1.0) + has_friendship (0.1.1) rails (~> 4.0) GEM @@ -46,6 +46,7 @@ GEM builder (3.2.2) byebug (8.2.1) coderay (1.1.0) + concurrent-ruby (1.0.0) coveralls (0.8.10) json (~> 1.8) rest-client (>= 1.6.8, < 2) @@ -183,12 +184,13 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.0) slop (3.6.0) - sprockets (3.4.1) + sprockets (3.5.2) + concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets-rails (3.0.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) sqlite3 (1.3.11) sqlite3 (1.3.11-x64-mingw32) term-ansicolor (1.3.2) diff --git a/lib/has_friendship/version.rb b/lib/has_friendship/version.rb index 49fe91a..1bbc7cb 100644 --- a/lib/has_friendship/version.rb +++ b/lib/has_friendship/version.rb @@ -1,3 +1,3 @@ module HasFriendship - VERSION = "0.1.0" + VERSION = "0.1.1" end