From b7b15a07bd9480fd2abe825d7d498bdb42995211 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Fri, 15 May 2015 16:11:52 -0400 Subject: [PATCH] Update to newest middleman-hashicorp --- website/Gemfile | 4 ++-- website/Gemfile.lock | 28 ++++++++++++++-------------- website/config.rb | 9 +++++---- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/website/Gemfile b/website/Gemfile index 850fc4b6c..7ef6a8f31 100644 --- a/website/Gemfile +++ b/website/Gemfile @@ -1,3 +1,3 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gem 'middleman-hashicorp', git: 'https://github.com/hashicorp/middleman-hashicorp' +gem "middleman-hashicorp", github: "hashicorp/middleman-hashicorp" diff --git a/website/Gemfile.lock b/website/Gemfile.lock index e86360532..7366999a6 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT - remote: https://github.com/hashicorp/middleman-hashicorp - revision: fb03b8e60efc96f68c2dded0f49632fcd6eb6482 + remote: git://github.com/hashicorp/middleman-hashicorp.git + revision: 7796ba44d303ac8e1b566e855e2766e6d0f695fc specs: middleman-hashicorp (0.1.0) bootstrap-sass (~> 3.3) @@ -26,7 +26,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - autoprefixer-rails (5.1.8) + autoprefixer-rails (5.1.11) execjs json bootstrap-sass (3.3.4.1) @@ -36,10 +36,10 @@ GEM celluloid (0.16.0) timers (~> 4.0.0) chunky_png (1.3.4) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1) + coffee-script-source (1.9.1.1) commonjs (0.2.7) compass (1.0.3) chunky_png (~> 1.2) @@ -59,7 +59,7 @@ GEM http_parser.rb (~> 0.6.0) erubis (2.7.0) eventmachine (1.0.7) - execjs (2.4.0) + execjs (2.5.2) ffi (1.9.8) haml (4.0.6) tilt @@ -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.10) + 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.10) + middleman-core (= 3.3.13) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.3.10) + 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.5.1) + 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) @@ -137,7 +137,7 @@ GEM rb-fsevent (0.9.4) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.2) + redcarpet (3.2.3) ref (1.0.5) rouge (1.8.0) sass (3.4.13) @@ -151,7 +151,7 @@ GEM sprockets-sass (1.3.1) sprockets (~> 2.0) tilt (~> 1.1) - therubyracer (0.12.1) + therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref thin (1.6.3) diff --git a/website/config.rb b/website/config.rb index 4bcd629db..80bbb6443 100644 --- a/website/config.rb +++ b/website/config.rb @@ -5,8 +5,9 @@ set :base_url, "https://www.terraform.io/" activate :hashicorp do |h| - h.version = ENV['TERRAFORM_VERSION'] - h.bintray_repo = 'mitchellh/terraform' - h.bintray_user = 'mitchellh' - h.bintray_key = ENV['BINTRAY_API_KEY'] + h.version = ENV["TERRAFORM_VERSION"] + h.bintray_enabled = ENV["BINTRAY_ENABLED"] + h.bintray_repo = "mitchellh/terraform" + h.bintray_user = "mitchellh" + h.bintray_key = ENV["BINTRAY_API_KEY"] end