From 9ed89542322f53550582bb96f3ae130c6ae7017d Mon Sep 17 00:00:00 2001 From: Mark Dodwell Date: Sat, 11 Jan 2014 14:07:44 -0800 Subject: [PATCH 1/3] bump 1.6.0 --- CHANGELOG.md | 2 +- lib/omniauth/facebook/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1278d88..836f2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.6.0.rc1 (Unreleased) +## 1.6.0 (2014-01-13) Features: diff --git a/lib/omniauth/facebook/version.rb b/lib/omniauth/facebook/version.rb index bdf2faa..bf5e6ac 100644 --- a/lib/omniauth/facebook/version.rb +++ b/lib/omniauth/facebook/version.rb @@ -1,5 +1,5 @@ module OmniAuth module Facebook - VERSION = "1.6.0.rc1" + VERSION = "1.6.0" end end From 669e4fd7a82bb805fc2e0361c62292391813a6be Mon Sep 17 00:00:00 2001 From: Mark Dodwell Date: Sat, 11 Jan 2014 14:15:51 -0800 Subject: [PATCH 2/3] Add temporary workaround for failing build on Ruby 1.8.7 Rubygems broke builds on Ruby 1.8.7: travis-ci/travis-ci#1793 rubygems/rubygems#763 This patch is a temporary workaround until rubygems is updated. --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ed6667e..e8837f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,10 @@ -rvm: +before_install: + - gem update bundler + - bundle --version + - gem update --system 2.1.11 + - gem --version + + rvm: - 1.8.7 - 1.9.2 - 1.9.3 From ccf9e16e052ac936c1de45d0ab6f6227daeba182 Mon Sep 17 00:00:00 2001 From: Mark Dodwell Date: Sat, 11 Jan 2014 14:18:21 -0800 Subject: [PATCH 3/3] fix broken travil YML. derp. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e8837f9..5c0f254 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,7 @@ before_install: - bundle --version - gem update --system 2.1.11 - gem --version - - rvm: +rvm: - 1.8.7 - 1.9.2 - 1.9.3