aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Loomans <noahloomans@gmail.com>2017-01-05 20:58:52 +0100
committerNoah Loomans <noahloomans@gmail.com>2017-01-05 20:58:52 +0100
commit3bd3427dc6350aa22ae08fd56cdbc6b0204d380a (patch)
treecc387c19a7be525b3f22ccd9073a539f6d3e014c
parentb427d2a512fea5044314e6ab4b554420c2538ea2 (diff)
parent40ecf806f649763e0cea002619563f8aecaa5f8c (diff)
Merge branch 'master' of gitlab.com:nloomans/noahloomans.com
-rw-r--r--.gitlab-ci.yml11
-rw-r--r--Gemfile24
-rw-r--r--Gemfile.lock56
-rw-r--r--_config.yml5
4 files changed, 11 insertions, 85 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..00e3259
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,11 @@
+image: ruby:2.3
+
+pages:
+ script:
+ - gem install jekyll
+ - jekyll build -d public
+ artifacts:
+ paths:
+ - public
+ only:
+ - master \ No newline at end of file
diff --git a/Gemfile b/Gemfile
deleted file mode 100644
index 3056ccc..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,24 +0,0 @@
-source "https://rubygems.org"
-ruby RUBY_VERSION
-
-# 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 "jekyll", "3.3.0"
-
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima", "~> 2.0"
-
-# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
-# uncomment the line below. To upgrade, run `bundle update github-pages`.
-# gem "github-pages", group: :jekyll_plugins
-
-# If you have any plugins, put them here!
-group :jekyll_plugins do
- gem "jekyll-feed", "~> 0.6"
-end
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index b41197d..0000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,56 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.5.0)
- public_suffix (~> 2.0, >= 2.0.2)
- colorator (1.1.0)
- ffi (1.9.14)
- forwardable-extended (2.6.0)
- jekyll (3.3.0)
- addressable (~> 2.4)
- colorator (~> 1.0)
- jekyll-sass-converter (~> 1.0)
- jekyll-watch (~> 1.1)
- kramdown (~> 1.3)
- liquid (~> 3.0)
- mercenary (~> 0.3.3)
- pathutil (~> 0.9)
- rouge (~> 1.7)
- safe_yaml (~> 1.0)
- jekyll-feed (0.8.0)
- jekyll (~> 3.3)
- jekyll-sass-converter (1.5.0)
- sass (~> 3.4)
- jekyll-watch (1.5.0)
- listen (~> 3.0, < 3.1)
- kramdown (1.13.1)
- liquid (3.0.6)
- listen (3.0.8)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- mercenary (0.3.6)
- minima (2.1.0)
- jekyll (~> 3.3)
- pathutil (0.14.0)
- forwardable-extended (~> 2.6)
- public_suffix (2.0.5)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.7)
- ffi (>= 0.5.0)
- rouge (1.11.1)
- safe_yaml (1.0.4)
- sass (3.4.23)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- jekyll (= 3.3.0)
- jekyll-feed (~> 0.6)
- minima (~> 2.0)
-
-RUBY VERSION
- ruby 2.3.1p112
-
-BUNDLED WITH
- 1.13.2
diff --git a/_config.yml b/_config.yml
index 4e8e9d6..9dfba6e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -20,11 +20,6 @@ url: "http://noahloomans.com" # the base hostname & protocol for your site, e.g.
# Build settings
markdown: kramdown
-gems:
- - jekyll-feed
-exclude:
- - Gemfile
- - Gemfile.lock
sass:
sass_dir: style \ No newline at end of file