From a533c25e56cbe3d388b2bcb952bf9601684907e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20Kentt=C3=A4l=C3=A4?= Date: Wed, 18 Jul 2018 10:52:00 +0300 Subject: [PATCH 1/4] CONTRIBUTING.md: initial version --- CONTRIBUTING.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..d8d8fd5 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,18 @@ +# CONTRIBUTING + +## Install Deps + +```bundle install --path vendor/bundle``` + +## Pull request workflow + +We recommend you use pull requests. + +### Create Branch + +* ```git checkout -b contributing``` +* edit +* Check the site: ```bundle exec jekyll serve``` - the site will is at +* ```git push``` + + From b04e4bdbd7fcd22f974f72da88030a5eacfb0815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20Kentt=C3=A4l=C3=A4?= Date: Wed, 18 Jul 2018 11:05:24 +0300 Subject: [PATCH 2/4] CONTRIBUTING.md: update --- CONTRIBUTING.md | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d8d8fd5..d0d311d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,18 +1,9 @@ # CONTRIBUTING -## Install Deps - -```bundle install --path vendor/bundle``` - -## Pull request workflow - -We recommend you use pull requests. - -### Create Branch - +* ```bundle install --path vendor/bundle``` * ```git checkout -b contributing``` -* edit -* Check the site: ```bundle exec jekyll serve``` - the site will is at -* ```git push``` - - +* Edit +* Check the site: ```bundle exec jekyll liveserve``` - the site is at +* ```git push --set-upstream origin contributing``` +* Go to GitHub and create a pull request +* Ask feedback for your pull request From 0d03a12f736b653a9baef2407fa9d37ddd25a0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20Kentt=C3=A4l=C3=A4?= Date: Wed, 18 Jul 2018 11:12:00 +0300 Subject: [PATCH 3/4] CONTRIBUTING update * Enable live updates for preview * Example screenshot for pull request --- Gemfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index 37f5eaa..c3b11bc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,6 @@ source 'https://rubygems.org' gem 'github-pages', group: :jekyll_plugins + +group :jekyll_plugins do + gem 'hawkins' +end From 37c24d0a7b95b5ceecb828d2bed87e80b648899b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20Kentt=C3=A4l=C3=A4?= Date: Wed, 18 Jul 2018 11:36:27 +0300 Subject: [PATCH 4/4] Gemfile.lock: update related to #17 --- Gemfile.lock | 103 ++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 50 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fa07042..19b9a52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -16,21 +16,22 @@ GEM commonmarker (0.17.9) ruby-enum (~> 0.5) concurrent-ruby (1.0.5) + dnsruby (1.60.2) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) ethon (0.11.0) ffi (>= 1.3.0) - eventmachine (1.2.5) + eventmachine (1.2.7) execjs (2.7.0) - faraday (0.14.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (180) - activesupport (= 4.2.9) - github-pages-health-check (= 1.4.0) + github-pages (187) + activesupport (= 4.2.10) + github-pages-health-check (= 1.8.1) jekyll (= 3.7.3) jekyll-avatar (= 0.5.0) jekyll-coffeescript (= 1.1.1) @@ -45,41 +46,44 @@ GEM jekyll-readme-index (= 0.2.0) jekyll-redirect-from (= 0.13.0) jekyll-relative-links (= 0.5.3) - jekyll-remote-theme (= 0.2.3) + jekyll-remote-theme (= 0.3.1) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.4.0) + jekyll-seo-tag (= 2.5.0) jekyll-sitemap (= 1.2.0) jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.0) - jekyll-theme-cayman (= 0.1.0) - jekyll-theme-dinky (= 0.1.0) - jekyll-theme-hacker (= 0.1.0) - jekyll-theme-leap-day (= 0.1.0) - jekyll-theme-merlot (= 0.1.0) - jekyll-theme-midnight (= 0.1.0) - jekyll-theme-minimal (= 0.1.0) - jekyll-theme-modernist (= 0.1.0) - jekyll-theme-primer (= 0.5.2) - jekyll-theme-slate (= 0.1.0) - jekyll-theme-tactile (= 0.1.0) - jekyll-theme-time-machine (= 0.1.0) + jekyll-theme-architect (= 0.1.1) + jekyll-theme-cayman (= 0.1.1) + jekyll-theme-dinky (= 0.1.1) + jekyll-theme-hacker (= 0.1.1) + jekyll-theme-leap-day (= 0.1.1) + jekyll-theme-merlot (= 0.1.1) + jekyll-theme-midnight (= 0.1.1) + jekyll-theme-minimal (= 0.1.1) + jekyll-theme-modernist (= 0.1.1) + jekyll-theme-primer (= 0.5.3) + jekyll-theme-slate (= 0.1.1) + jekyll-theme-tactile (= 0.1.1) + jekyll-theme-time-machine (= 0.1.1) jekyll-titles-from-headings (= 0.5.1) jemoji (= 0.9.0) kramdown (= 1.16.2) liquid (= 4.0.0) listen (= 3.1.5) mercenary (~> 0.3) - minima (= 2.4.0) - nokogiri (>= 1.8.1, < 2.0) + minima (= 2.4.1) + nokogiri (>= 1.8.2, < 2.0) rouge (= 2.2.1) terminal-table (~> 1.4) - github-pages-health-check (1.4.0) + github-pages-health-check (1.8.1) addressable (~> 2.3) - net-dns (~> 0.8) + dnsruby (~> 1.60) octokit (~> 4.0) public_suffix (~> 2.0) typhoeus (~> 1.3) - html-pipeline (2.7.1) + hawkins (2.0.5) + em-websocket (~> 0.5) + jekyll (~> 3.1) + html-pipeline (2.8.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -132,55 +136,54 @@ GEM jekyll (~> 3.3) jekyll-relative-links (0.5.3) jekyll (~> 3.3) - jekyll-remote-theme (0.2.3) + jekyll-remote-theme (0.3.1) jekyll (~> 3.5) rubyzip (>= 1.2.1, < 3.0) - typhoeus (>= 0.7, < 2.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) jekyll-swiss (0.4.0) - jekyll-theme-architect (0.1.0) + jekyll-theme-architect (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.0) + jekyll-theme-cayman (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.0) + jekyll-theme-dinky (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.0) + jekyll-theme-hacker (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.0) + jekyll-theme-leap-day (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.0) + jekyll-theme-merlot (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.0) + jekyll-theme-midnight (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.0) + jekyll-theme-minimal (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.0) + jekyll-theme-modernist (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.2) + jekyll-theme-primer (0.5.3) jekyll (~> 3.5) jekyll-github-metadata (~> 2.9) - jekyll-seo-tag (~> 2.2) - jekyll-theme-slate (0.1.0) + jekyll-seo-tag (~> 2.0) + jekyll-theme-slate (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.0) + jekyll-theme-tactile (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.0) + jekyll-theme-time-machine (0.1.1) jekyll (~> 3.5) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.1) @@ -200,16 +203,15 @@ GEM ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minima (2.4.0) + minima (2.4.1) jekyll (~> 3.5) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.11.3) multipart-post (2.0.0) - net-dns (0.8.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) @@ -238,13 +240,14 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) PLATFORMS ruby DEPENDENCIES github-pages + hawkins BUNDLED WITH - 1.16.1 + 1.16.2