bryan/www
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge upstream

Browse Source
This commit is contained in:
Bryan Roessler
2020-07-14 17:44:11 -04:00
parent 44353ad37a
commit 489b8963c7
145 changed files with 3145 additions and 21875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
cv.bryanroessler.com/Gemfile.lock
View File

@@ -1,12 +1,19 @@
GEM
remote: https://rubygems.org/
specs:
<<<<<<< HEAD
activesupport (6.0.2.1)
=======
activesupport (5.2.4.3)
>>>>>>> origin/gh-pages
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
<<<<<<< HEAD
zeitwerk (~> 2.2)
=======
>>>>>>> origin/gh-pages
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
coffee-script (2.4.1)
@@ -25,10 +32,19 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
<<<<<<< HEAD
execjs (2.7.0)
faraday (1.0.0)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
=======
eventmachine (1.2.7-x64-mingw32)
execjs (2.7.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.12.2-x64-mingw32)
>>>>>>> origin/gh-pages
forwardable-extended (2.6.0)
gemoji (3.0.1)
github-pages (204)
@@ -202,16 +218,27 @@ GEM
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
<<<<<<< HEAD
minitest (5.14.0)
multipart-post (2.1.1)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
octokit (4.17.0)
=======
minitest (5.14.1)
multipart-post (2.1.1)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.9-x64-mingw32)
mini_portile2 (~> 2.4.0)
octokit (4.18.0)
>>>>>>> origin/gh-pages
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (3.1.1)
<<<<<<< HEAD
rake (13.0.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.1)
@@ -220,6 +247,15 @@ GEM
ruby-enum (0.7.2)
i18n
rubyzip (2.3.0)
=======
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
rouge (3.13.0)
ruby-enum (0.8.0)
i18n
rubyzip (1.3.0)
>>>>>>> origin/gh-pages
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
@@ -232,12 +268,20 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
<<<<<<< HEAD
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.6)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
zeitwerk (2.3.0)
=======
typhoeus (1.4.0)
ethon (>= 0.9.0)
tzinfo (1.2.7)
thread_safe (~> 0.1)
unicode-display_width (1.7.0)
>>>>>>> origin/gh-pages
PLATFORMS
ruby
@@ -247,4 +291,8 @@ DEPENDENCIES
rake
BUNDLED WITH
<<<<<<< HEAD
2.0.2
=======
2.1.4
>>>>>>> origin/gh-pages