From 4de2dd31f0962e924724a9182c816e91b5a82ceb Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Fri, 9 Oct 2015 18:29:08 -0400 Subject: [PATCH 1/4] Add makefile and update readme --- website/Makefile | 10 ++++++++++ website/README.md | 7 +------ 2 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 website/Makefile diff --git a/website/Makefile b/website/Makefile new file mode 100644 index 0000000000..e1c782e070 --- /dev/null +++ b/website/Makefile @@ -0,0 +1,10 @@ +all: build + +init: + bundle + +dev: init + bundle exec middleman server + +build: init + bundle exec middleman build diff --git a/website/README.md b/website/README.md index 67fbaa54d8..ee619d9dc2 100644 --- a/website/README.md +++ b/website/README.md @@ -11,12 +11,7 @@ If you find a typo or you feel like you can improve the HTML, CSS, or JavaScript Running the Site Locally ------------------------ -Running the site locally is simple. Clone this repo and run the following commands: - -``` -$ bundle -$ bundle exec middleman server -``` +Running the site locally is simple. Clone this repo and run `make dev`. Then open up `localhost:4567`. Note that some URLs you may need to append ".html" to make them work (in the navigation and such). From 30c4ef88af964e22a5aeadf4a9bc2690e8f28c23 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Mon, 12 Oct 2015 18:43:15 -0400 Subject: [PATCH 2/4] Add github_slug to website/config.rb --- website/config.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/website/config.rb b/website/config.rb index bd5b57bd74..9fe973fea5 100644 --- a/website/config.rb +++ b/website/config.rb @@ -10,6 +10,7 @@ activate :hashicorp do |h| h.bintray_repo = "mitchellh/consul" h.bintray_user = "mitchellh" h.bintray_key = ENV["BINTRAY_API_KEY"] + h.github_slug = "hashicorp/consul" # Do not include the "web" in the default list of packages h.bintray_exclude_proc = Proc.new do |os, filename| From d25e6390b61fbc0d7816ce908c358edf86031262 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Mon, 12 Oct 2015 18:44:22 -0400 Subject: [PATCH 3/4] Add edit this page link in footer --- website/source/layouts/_footer.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb index b3d9767b99..3a771b6ac7 100644 --- a/website/source/layouts/_footer.erb +++ b/website/source/layouts/_footer.erb @@ -4,8 +4,11 @@
    From ea5d041ece4542106a0b4ef04d6a1af6a9b21582 Mon Sep 17 00:00:00 2001 From: Sam Handler Date: Mon, 12 Oct 2015 18:44:58 -0400 Subject: [PATCH 4/4] bundle update middleman-hashicorp --- website/Gemfile.lock | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 29ad251b5e..72f1c08e25 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://github.com/hashicorp/middleman-hashicorp.git - revision: 93983af15fd8d480bec266b50c9211a48e495815 + revision: b152b6436348e8e1f9990436228b25b4c5c6fcb8 specs: middleman-hashicorp (0.1.0) bootstrap-sass (~> 3.3) @@ -27,7 +27,7 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (5.2.1.3) + autoprefixer-rails (6.0.3) execjs json bootstrap-sass (3.3.5.1) @@ -76,7 +76,7 @@ GEM http_parser.rb (0.6.0) i18n (0.7.0) json (1.8.3) - kramdown (1.8.0) + kramdown (1.9.0) less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.11) @@ -121,9 +121,9 @@ GEM middleman-syntax (2.0.0) middleman-core (~> 3.2) rouge (~> 1.0) - mime-types (2.6.1) + mime-types (2.6.2) mini_portile (0.6.2) - minitest (5.8.0) + minitest (5.8.1) multi_json (1.11.2) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) @@ -148,10 +148,10 @@ GEM rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.2) + redcarpet (3.3.3) ref (2.0.0) - rouge (1.9.1) - sass (3.4.18) + rouge (1.10.1) + sass (3.4.19) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -165,9 +165,9 @@ GEM therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref - thin (1.6.3) + thin (1.6.4) daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) + eventmachine (~> 1.0, >= 1.0.4) rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) @@ -186,3 +186,6 @@ PLATFORMS DEPENDENCIES middleman-hashicorp! + +BUNDLED WITH + 1.10.6