haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8654 from katiebayes/master 

update middleman version from 22 to 26
This commit is contained in:
Chris Roberts 2017-06-14 15:20:16 -07:00 committed by GitHub
parent ba66485f47 e2441dd4b7
commit 37b3fd346d
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/Gemfile
View File

@ -1,3 +1,3 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "middleman-hashicorp", "0.3.22" gem "middleman-hashicorp", "0.3.26"

28
website/Gemfile.lock
View File

@ -6,7 +6,7 @@ GEM
minitest (~> 5.1) minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4) thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1) tzinfo (~> 1.1)
autoprefixer-rails (6.7.7.1) autoprefixer-rails (7.1.1)
execjs execjs
bootstrap-sass (3.3.7) bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1) autoprefixer-rails (>= 5.2.1)
@ -42,14 +42,15 @@ GEM
eventmachine (1.2.3) eventmachine (1.2.3)
execjs (2.7.0) execjs (2.7.0)
ffi (1.9.18) ffi (1.9.18)
haml (4.0.7) haml (5.0.1)
temple (>= 0.8.0)
tilt tilt
hike (1.2.3) hike (1.2.3)
hooks (0.4.1) hooks (0.4.1)
uber (~> 0.0.14) uber (~> 0.0.14)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (0.7.0) i18n (0.7.0)
json (2.0.3) json (2.1.0)
kramdown (1.13.2) kramdown (1.13.2)
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
@ -77,7 +78,7 @@ GEM
rack (>= 1.4.5, < 2.0) rack (>= 1.4.5, < 2.0)
thor (>= 0.15.2, < 2.0) thor (>= 0.15.2, < 2.0)
tilt (~> 1.4.1, < 2.0) tilt (~> 1.4.1, < 2.0)
middleman-hashicorp (0.3.22) middleman-hashicorp (0.3.26)
bootstrap-sass (~> 3.3) bootstrap-sass (~> 3.3)
builder (~> 3.2) builder (~> 3.2)
middleman (~> 3.4) middleman (~> 3.4)
@ -100,18 +101,18 @@ GEM
mime-types (3.1) mime-types (3.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521) mime-types-data (3.2016.0521)
mini_portile2 (2.1.0) mini_portile2 (2.2.0)
minitest (5.10.1) minitest (5.10.2)
multi_json (1.12.1) multi_json (1.12.1)
nokogiri (1.7.1) nokogiri (1.8.0)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.2.0)
padrino-helpers (0.12.8.1) padrino-helpers (0.12.8.1)
i18n (~> 0.6, >= 0.6.7) i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.12.8.1) padrino-support (= 0.12.8.1)
tilt (~> 1.4.1) tilt (~> 1.4.1)
padrino-support (0.12.8.1) padrino-support (0.12.8.1)
activesupport (>= 3.1) activesupport (>= 3.1)
rack (1.6.5) rack (1.6.8)
rack-livereload (0.3.16) rack-livereload (0.3.16)
rack rack
rack-test (0.6.3) rack-test (0.6.3)
@ -121,7 +122,7 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
redcarpet (3.4.0) redcarpet (3.4.0)
rouge (2.0.7) rouge (2.0.7)
sass (3.4.23) sass (3.4.24)
sprockets (2.12.4) sprockets (2.12.4)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
@ -132,26 +133,27 @@ GEM
sprockets-sass (1.3.1) sprockets-sass (1.3.1)
sprockets (~> 2.0) sprockets (~> 2.0)
tilt (~> 1.1) tilt (~> 1.1)
temple (0.8.0)
thor (0.19.4) thor (0.19.4)
thread_safe (0.3.6) thread_safe (0.3.6)
tilt (1.4.1) tilt (1.4.1)
turbolinks (5.0.1) turbolinks (5.0.1)
turbolinks-source (~> 5) turbolinks-source (~> 5)
turbolinks-source (5.0.0) turbolinks-source (5.0.3)
tzinfo (1.2.3) tzinfo (1.2.3)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uber (0.0.15) uber (0.0.15)
uglifier (2.7.2) uglifier (2.7.2)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
xpath (2.0.0) xpath (2.1.0)
nokogiri (~> 1.3) nokogiri (~> 1.3)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
middleman-hashicorp (= 0.3.22) middleman-hashicorp (= 0.3.26)
BUNDLED WITH BUNDLED WITH
1.14.6 1.14.6

2
website/Makefile
View File

@ -1,4 +1,4 @@
VERSION?="0.3.22" VERSION?="0.3.26"
build: build:
@echo "==> Starting build in Docker..." @echo "==> Starting build in Docker..."

2
website/packer.json
View File

@ -8,7 +8,7 @@
"builders": [ "builders": [
{ {
"type": "docker", "type": "docker",
"image": "hashicorp/middleman-hashicorp:0.3.22", "image": "hashicorp/middleman-hashicorp:0.3.26",
"discard": "true", "discard": "true",
"run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"] "run_command": ["-d", "-i", "-t", "{{ .Image }}", "/bin/sh"]
} }