From 549f959ab46a5d6eb02b478bb7abbe9f674e984f Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 15 May 2015 16:06:10 -0400 Subject: [PATCH] Use new middleman-hashicorp --- website/Gemfile | 6 +++--- website/Gemfile.lock | 14 +++++++------- website/config.rb | 11 ++++++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/website/Gemfile b/website/Gemfile index 54e8cc74ca..2b35e28106 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,5 +1,5 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -ruby '2.2.2' +ruby "2.2.2" -gem 'middleman-hashicorp', github: 'hashicorp/middleman-hashicorp' +gem "middleman-hashicorp", github: "hashicorp/middleman-hashicorp" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index ea69474be0..7366999a6c 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: 5d1edbfa4ceec20b33b501f0162e2f881afadfa9 + revision: 7796ba44d303ac8e1b566e855e2766e6d0f695fc specs: middleman-hashicorp (0.1.0) bootstrap-sass (~> 3.3) @@ -71,7 +71,7 @@ GEM http_parser.rb (0.6.0) i18n (0.7.0) json (1.8.2) - kramdown (1.6.0) + kramdown (1.7.0) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.7) @@ -79,18 +79,18 @@ GEM celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.3.11) + middleman (3.3.13) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.3.11) + middleman-core (= 3.3.13) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.11) + middleman-core (3.3.13) activesupport (~> 4.1.0) bundler (~> 1.1) erubis @@ -117,7 +117,7 @@ GEM middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - minitest (5.6.0) + minitest (5.6.1) multi_json (1.11.0) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) @@ -125,7 +125,7 @@ GEM tilt (~> 1.4.1) padrino-support (0.12.5) activesupport (>= 3.1) - rack (1.6.0) + rack (1.6.1) rack-contrib (1.2.0) rack (>= 0.9.1) rack-livereload (0.3.15) diff --git a/website/config.rb b/website/config.rb index 447746ae9a..4332c28434 100644 --- a/website/config.rb +++ b/website/config.rb @@ -5,14 +5,15 @@ set :base_url, "https://www.consul.io/" activate :hashicorp do |h| - h.version = '0.5.1' - h.bintray_repo = 'mitchellh/consul' - h.bintray_user = 'mitchellh' - h.bintray_key = ENV['BINTRAY_API_KEY'] + h.version = "0.5.1" + h.bintray_enabled = ENV["BINTRAY_ENABLED"] + h.bintray_repo = "mitchellh/consul" + h.bintray_user = "mitchellh" + h.bintray_key = ENV["BINTRAY_API_KEY"] # Do not include the "web" in the default list of packages h.bintray_exclude_proc = Proc.new do |os, filename| - os == 'web' + os == "web" end # Consul packages are not prefixed with consul_ - they should be in the