From b39deb560f7bce71a5346d3489743737176ac47a Mon Sep 17 00:00:00 2001 From: Robert Lord Date: Mon, 18 Nov 2013 09:00:12 -0800 Subject: [PATCH] Update github-linguist, middleman, add Gemnasium status badge --- Gemfile | 4 ++-- Gemfile.lock | 45 +++++++++++++++++++++------------------------ README.md | 2 +- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index d15f864..d096ace 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ # the following line to use "https" source 'http://rubygems.org' -gem "middleman", "~>3.1.5" +gem "middleman", "~>3.2.0" # For syntax highlighting gem "middleman-syntax" @@ -15,7 +15,7 @@ gem "middleman-livereload", "~> 3.1.0" gem 'redcarpet', git: 'https://github.com/vmg/redcarpet.git' -gem "github-linguist" +gem "github-linguist", "~> 2.9.5" # For faster file watcher updates on Windows: gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw] diff --git a/Gemfile.lock b/Gemfile.lock index a47b5b8..2a8c1a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,17 +1,17 @@ GIT remote: https://github.com/vmg/redcarpet.git - revision: 2f27273c10cc2779d539c48d605c4a25eb8e34a3 + revision: a072e16f547883518bd22bd0df0f4bfa2d4a149b specs: redcarpet (3.0.0) GEM remote: http://rubygems.org/ specs: - activesupport (3.2.14) + activesupport (3.2.15) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) charlock_holmes (0.6.9.4) - chunky_png (1.2.8) + chunky_png (1.2.9) coffee-script (2.2.0) coffee-script-source execjs @@ -27,39 +27,38 @@ GEM eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) - ffi (1.9.0) + ffi (1.9.3) fssm (0.2.10) - github-linguist (2.9.4) + github-linguist (2.9.5) charlock_holmes (~> 0.6.6) escape_utils (~> 0.3.1) mime-types (~> 1.19) pygments.rb (~> 0.5.2) - haml (4.0.3) + haml (4.0.4) tilt hike (1.2.3) http_parser.rb (0.5.3) i18n (0.6.5) - kramdown (1.1.0) - listen (1.2.3) + kramdown (1.2.0) + listen (1.3.1) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) rb-kqueue (>= 0.2) - middleman (3.1.5) + middleman (3.2.0) coffee-script (~> 2.2.0) compass (>= 0.12.2) execjs (~> 1.4.0) haml (>= 3.1.6) - kramdown (~> 1.1.0) - middleman-core (= 3.1.5) - middleman-more (= 3.1.5) + kramdown (~> 1.2) + middleman-core (= 3.2.0) middleman-sprockets (>= 3.1.2) sass (>= 3.1.20) uglifier (~> 2.1.0) - middleman-core (3.1.5) + middleman-core (3.2.0) activesupport (~> 3.2.6) bundler (~> 1.1) i18n (~> 0.6.1) - listen (~> 1.2.2) + listen (~> 1.1) rack (>= 1.4.5) rack-test (~> 0.6.1) thor (>= 0.15.2, < 2.0) @@ -71,10 +70,8 @@ GEM middleman-core (>= 3.0.2) multi_json (~> 1.0) rack-livereload - middleman-more (3.1.5) - middleman-sprockets (3.1.4) - middleman-core (>= 3.0.14) - middleman-more (>= 3.0.14) + middleman-sprockets (3.2.0) + middleman-core (~> 3.2) sprockets (~> 2.1) sprockets-helpers (~> 1.0.0) sprockets-sass (~> 1.0.0) @@ -82,9 +79,9 @@ GEM middleman-core (~> 3.0) rouge (~> 0.3.0) mime-types (1.25) - multi_json (1.8.0) + multi_json (1.8.2) posix-spawn (0.3.6) - pygments.rb (0.5.2) + pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) rack (1.5.2) @@ -101,7 +98,7 @@ GEM rouge (0.3.10) thor ruby18_source_location (0.2) - sass (3.2.10) + sass (3.2.12) sprockets (2.10.0) hike (~> 1.2) multi_json (~> 1.0) @@ -109,7 +106,7 @@ GEM tilt (~> 1.1, != 1.3.0) sprockets-helpers (1.0.1) sprockets (~> 2.0) - sprockets-sass (1.0.1) + sprockets-sass (1.0.2) sprockets (~> 2.0) tilt (~> 1.1) thor (0.18.1) @@ -123,8 +120,8 @@ PLATFORMS ruby DEPENDENCIES - github-linguist - middleman (~> 3.1.5) + github-linguist (~> 2.9.5) + middleman (~> 3.2.0) middleman-gh-pages middleman-livereload (~> 3.1.0) middleman-syntax diff --git a/README.md b/README.md index 9d01476..7d7c4d1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Slate +Slate [![Dependency Status](https://gemnasium.com/tripit/slate.png)](https://gemnasium.com/tripit/slate) ======== Slate helps you create beautiful single-page API documentation. Think of it as an intelligent, modern documentation template for your API.