Skip to content

Commit 08a92a1

Browse files
committed
Upgrade to Slate 2.13
2 parents 5decd5b + 848d9ee commit 08a92a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+15405
-3805
lines changed

Diff for: .dockerignore

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.git/
2+
.github/
3+
build/
4+
.editorconfig
5+
.gitattributes
6+
.gitignore
7+
CHANGELOG.md
8+
CODE_OF_CONDUCT.md
9+
deploy.sh
10+
font-selection.json
11+
README.md
12+
Vagrantfile

Diff for: .editorconfig

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# Top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 2
12+
trim_trailing_whitespace = true
13+
14+
[*.rb]
15+
charset = utf-8
16+
17+
[*.md]
18+
trim_trailing_whitespace = false

Diff for: .gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
source/javascripts/lib/* linguist-vendored

Diff for: .gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ tmp
1414
*.DS_STORE
1515
build/
1616
.cache
17+
.sass-cache
1718

1819
# YARD artifacts
1920
.yardoc
@@ -22,4 +23,4 @@ doc/
2223
.idea/
2324

2425
# rbenv
25-
vendor
26+
vendor

Diff for: CHANGELOG.md

-49
This file was deleted.

Diff for: CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Contributing to our API docs.
22

3-
As a Monzo staff member you can deploy this to docs.monzo.com by merging to master and running `make publish`
3+
As a Monzo staff member you can deploy this to docs.monzo.com by merging to master and running `./deploy.sh`
44

55
For non-Monzo staff, send us PR's or raise issues.

Diff for: Dockerfile

+21-20
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
# Start from the official Ruby image for 2.6.X, 2.7 works but spams a lot of warnings about stuff being deprecated
2-
# in 3.0, and indeex any Ruby 3 version won't work
3-
FROM ruby:2.6
1+
FROM ruby:2.6-slim
42

5-
# Install the highest version of bundler that is compatible with the Gemfile
6-
RUN gem install bundler -N -v 1.17.3
7-
# Install the latest version of Node LTS
8-
# taken from https://github.com/nodesource/distributions/blob/master/README.md#node-lts
9-
RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
10-
RUN apt-get install -y nodejs
3+
WORKDIR /srv/slate
114

12-
# Set our working directory
13-
WORKDIR /app
5+
EXPOSE 4567
146

15-
# Add Gemfile and Gemfile.lock and install dependencies before adding the actual app so that
16-
# Docker can cache these layers and reuse them even when we change the app code
17-
ADD Gemfile Gemfile.lock /app/
18-
RUN bundle install
7+
COPY Gemfile .
8+
COPY Gemfile.lock .
199

20-
# Finally add the actual app
21-
ADD . /app
10+
RUN apt-get update \
11+
&& apt-get install -y --no-install-recommends \
12+
build-essential \
13+
git \
14+
nodejs \
15+
&& gem install bundler \
16+
&& bundle install \
17+
&& apt-get remove -y build-essential git \
18+
&& apt-get autoremove -y \
19+
&& rm -rf /var/lib/apt/lists/*
2220

23-
# Run the app locally
24-
EXPOSE 4567
25-
CMD ["bundle", "exec", "middleman", "server"]
21+
COPY . /srv/slate
22+
23+
RUN chmod +x /srv/slate/slate.sh
24+
25+
ENTRYPOINT ["/srv/slate/slate.sh"]
26+
CMD ["build"]

Diff for: Gemfile

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
ruby '>= 2.6'
12
source 'https://rubygems.org'
23

34
# Middleman
4-
gem 'middleman', '~>3.3.10'
5-
gem 'middleman-gh-pages', '~> 0.0.3'
6-
gem 'middleman-syntax', '~> 2.0.0'
7-
gem 'middleman-autoprefixer', '~> 2.4.4'
8-
gem 'middleman-robots'
9-
gem 'rouge', '~> 1.9.0'
10-
gem 'redcarpet', '~> 3.3.2'
11-
12-
gem 'rake', '~> 10.4.2'
5+
gem 'middleman', '~> 4.4'
6+
gem 'middleman-syntax', '~> 3.2'
7+
gem 'middleman-autoprefixer', '~> 3.0'
8+
gem 'middleman-sprockets', '~> 4.1'
9+
gem 'rouge', '~> 3.21'
10+
gem 'redcarpet', '~> 3.5.0'
11+
gem 'nokogiri', '~> 1.13.3'
12+
gem 'sass'
13+
gem 'webrick'

0 commit comments

Comments
 (0)