Merge branch 'feature/gemfile' into develop

This commit is contained in:
Michael Rose 2016-08-01 08:46:34 -04:00
commit 1bb5fea886
3 changed files with 40 additions and 19 deletions

25
Gemfile
View file

@ -1,5 +1,24 @@
source "https://rubygems.org"
gem "github-pages"
# gem "jekyll-archives"
gem "wdm", "~> 0.1.0" if Gem.win_platform?
# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
#
# bundle exec jekyll serve
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "github-pages", group: :jekyll_plugins
# If you want to use Jekyll native, uncomment the line below.
# To upgrade, run `bundle update`.
# gem "jekyll"
gem "wdm", "~> 0.1.0" if Gem.win_platform?
# If you have any plugins, put them here!
group :jekyll_plugins do
# gem "jekyll-archives"
end

View file

@ -21,7 +21,7 @@ GEM
ffi (1.9.14)
ffi (1.9.14-x64-mingw32)
gemoji (2.1.0)
github-pages (88)
github-pages (89)
activesupport (= 4.2.7)
github-pages-health-check (= 1.1.0)
jekyll (= 3.1.6)
@ -35,7 +35,7 @@ GEM
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 2.0.0)
jekyll-sitemap (= 0.10.0)
jemoji (= 0.6.2)
jemoji (= 0.7.0)
kramdown (= 1.11.1)
liquid (= 3.0.6)
listen (= 3.0.6)
@ -82,7 +82,8 @@ GEM
jekyll-sitemap (0.10.0)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
jemoji (0.6.2)
jemoji (0.7.0)
activesupport (~> 4.0)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)

View file

@ -13,6 +13,7 @@ name : "Your Name"
description : "An amazing website."
url : # the base hostname & protocol for your site e.g. "https://mmistakes.github.io"
baseurl : # the subpath of your site, e.g. "/blog"
repository : # GitHub username/repo-name e.g. "mmistakes/minimal-mistakes"
gh_repo :
teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
# breadcrumbs : false # true, false (default)
@ -153,20 +154,20 @@ timezone: # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# Plugins
gems:
- jekyll-paginate
- jekyll-sitemap
- jekyll-gist
- jekyll-feed
- jemoji
# gems:
# - jekyll-paginate
# - jekyll-sitemap
# - jekyll-gist
# - jekyll-feed
# - jemoji
# mimic GitHub Pages with --safe
whitelist:
- jekyll-paginate
- jekyll-sitemap
- jekyll-gist
- jekyll-feed
- jemoji
# whitelist:
# - jekyll-paginate
# - jekyll-sitemap
# - jekyll-gist
# - jekyll-feed
# - jemoji
# Archives
@ -203,4 +204,4 @@ tag_archive:
compress_html:
clippings: all
ignore:
envs: development
envs: development