Skip to content

Commit 659ac93

Browse files
committed
Merge branch 'master' into feature/ramda
2 parents 935b36d + 8ff4ace commit 659ac93

File tree

236 files changed

+2260
-597
lines changed

Some content is hidden

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

236 files changed

+2260
-597
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ indent_style = space
66
indent_size = 2
77
insert_final_newline = true
88
trim_trailing_whitespace = true
9+
10+
[*.md]
11+
trim_trailing_whitespace = false

.github/CONTRIBUTING.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Want to contribute? Great. Please review the following guidelines carefully and
2424
## Requesting new features
2525

2626
1. Search for similar feature requests; someone may have already requested it.
27-
2. Make sure your feature fits DevDocs's [vision](https://github.com/freeCodeCamp/devdocs/blob/master/README.md#vision).
27+
2. Make sure your feature fits DevDocs's [vision](../README.md#vision).
2828
3. Provide a clear and detailed explanation of the feature and why it's important to add it.
2929

3030
## Requesting new documentations
3131

32-
Please don't open issues to request new documentations.
32+
Please don't open issues to request new documentations.
3333
Use the [Trello board](https://trello.com/b/6BmTulfx/devdocs-documentation) where everyone can vote.
3434

3535
## Contributing code and features
@@ -44,7 +44,7 @@ Use the [Trello board](https://trello.com/b/6BmTulfx/devdocs-documentation) wher
4444

4545
## Contributing new documentations
4646

47-
See the [wiki](https://github.com/freeCodeCamp/devdocs/wiki) to learn how to add new documentations.
47+
See the [`docs` folder](https://github.com/freeCodeCamp/devdocs/tree/master/docs) to learn how to add new documentations.
4848

4949
**Important:** the documentation's license must permit alteration, redistribution and commercial use, and the documented software must be released under an open source license. Feel free to get in touch if you're not sure if a documentation meets those requirements.
5050

@@ -55,13 +55,12 @@ In addition to the [guidelines for contributing code](#contributing-code-and-fea
5555
* Remove as much content and HTML markup as possible, particularly content not associated with any entry (e.g. introduction, changelog, etc.).
5656
* Names must be as short as possible and unique across the documentation.
5757
* The number of types (categories) should ideally be less than 100.
58-
* Don't modify the icon sprite. I'll do it after your pull request is merged.
5958

6059
## Updating existing documentations
6160

6261
Please don't submit a pull request updating the version number of a documentation, unless a change is required in the scraper and you've verified that it works.
6362

64-
To ask that an existing documentation be updated, please use the [Trello board](https://trello.com/c/2B0hmW7M/52-request-updates-here).
63+
To ask that an existing documentation be updated, first check the last two [documentation versions reports](https://github.com/freeCodeCamp/devdocs/issues?utf8=%E2%9C%93&q=Documentation+versions+report+is%3Aissue+author%3Adevdocs-bot+sort%3Acreated-desc). Only create an issue if the documentation has been wrongly marked as up-to-date.
6564

6665
## Coding conventions
6766

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
Please read the contributing guidelines before opening an issue:
33
https://github.com/freeCodeCamp/devdocs/blob/master/.github/CONTRIBUTING.md
44
5-
To request a new documentation, or an update of an existing documentation, go here:
5+
Go here to request a new documentation:
66
https://trello.com/b/6BmTulfx/devdocs-documentation
77
-->

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.bundle
3+
log
34
tmp
45
public/assets
56
public/fonts

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.3

.slugignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
public/icons
2-
test
1+
test

.travis.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
language: ruby
22

3+
addons:
4+
apt:
5+
packages:
6+
- libcurl4-openssl-dev
7+
38
cache: bundler
49

5-
before_script:
10+
before_install:
11+
- "echo 'gem: --no-document' > ~/.gemrc"
612
- gem update --system
713
- gem install bundler
14+
15+
script:
16+
- if [ "$TRAVIS_EVENT_TYPE" != "cron" ]; then bundle exec rake; fi
17+
- if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then bundle exec thor updates:check --github-token $GH_TOKEN --upload; fi
18+
19+
deploy:
20+
provider: heroku
21+
app: devdocs
22+
on:
23+
branch: master
24+
condition: $TRAVIS_EVENT_TYPE != cron
25+
api_key:
26+
secure: "4p1klvWJZSOImzFcKOduILjP93hlOlAhceWlYMKS4tU+TCFE8qTBzdKdFPSCsCgjB+YR9pBss+L0lJpVVMjSwFHXqpKe6EeUSltO2k7DFHfW7kXLUM/L0AfqXz+YXk76XUyZMhvOEbldPfaMaj10e8vgDOQCSHABDyK/4CU+hnI="

CODE_OF_CONDUCT.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
> Our Code of Conduct is available here: <https://code-of-conduct.freecodecamp.org/>

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM ruby:2.6.0
1+
FROM ruby:2.6.3
22

33
ENV LANG=C.UTF-8
4+
ENV ENABLE_SERVICE_WORKER=true
45

56
WORKDIR /devdocs
67

78
RUN apt-get update && \
8-
apt-get -y install git nodejs && \
9+
apt-get -y install git nodejs libcurl4 && \
910
gem install bundler && \
1011
rm -rf /var/lib/apt/lists/*
1112

Dockerfile-alpine

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
FROM ruby:2.6.0-alpine
1+
FROM ruby:2.6.3-alpine
22

33
ENV LANG=C.UTF-8
4+
ENV ENABLE_SERVICE_WORKER=true
45

56
WORKDIR /devdocs
67

78
COPY . /devdocs
89

9-
RUN apk --update add nodejs build-base libstdc++ gzip git zlib-dev && \
10+
RUN apk --update add nodejs build-base libstdc++ gzip git zlib-dev libcurl && \
1011
gem install bundler && \
1112
bundle install --system --without test && \
1213
thor docs:download --all && \

0 commit comments

Comments
 (0)