Skip to content

Commit 6893ac9

Browse files
authored
Merge branch 'master' into fix-829
2 parents fd6afbe + 8420f66 commit 6893ac9

File tree

328 files changed

+4297
-1495
lines changed

Some content is hidden

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

328 files changed

+4297
-1495
lines changed

.editorconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_style = space
6+
indent_size = 2
7+
insert_final_newline = true
8+
trim_trailing_whitespace = true

CONTRIBUTING.md renamed to .github/CONTRIBUTING.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ Want to contribute? Great. Please review the following guidelines carefully and
2727
2. Make sure your feature fits DevDocs's [vision](https://github.com/freeCodeCamp/devdocs/blob/master/README.md#vision).
2828
3. Provide a clear and detailed explanation of the feature and why it's important to add it.
2929

30-
For general feedback and ideas, please use the [mailing list](https://groups.google.com/d/forum/devdocs).
31-
3230
## Requesting new documentations
3331

3432
Please don't open issues to request new documentations.
@@ -37,7 +35,7 @@ Use the [Trello board](https://trello.com/b/6BmTulfx/devdocs-documentation) wher
3735
## Contributing code and features
3836

3937
1. Search for existing issues; someone may already be working on a similar feature.
40-
2. Before embarking on any significant pull request, please open an issue describing the changes you intend to make. Otherwise you risk spending a lot of time working on something I may not want to merge. This also tells other contributors that you're working on the feature.
38+
2. Before embarking on any significant pull request, please open an issue describing the changes you intend to make. Otherwise you risk spending a lot of time working on something we may not want to merge. This also tells other contributors that you're working on the feature.
4139
3. Follow the [coding conventions](#coding-conventions).
4240
4. If you're modifying the Ruby code, include tests and ensure they pass.
4341
5. Try to keep your pull request small and simple.
@@ -65,13 +63,6 @@ Please don't submit a pull request updating the version number of a documentatio
6563

6664
To ask that an existing documentation be updated, please use the [Trello board](https://trello.com/c/2B0hmW7M/52-request-updates-here).
6765

68-
## Other contributions
69-
70-
Besides new docs and features, here are other ways you can contribute:
71-
72-
* **Improve our copy.** English isn't my first language so if you notice grammatical or usage errors, feel free to submit a pull request — it'll be much appreciated.
73-
* **Participate in the issue tracker.** Your opinion matters — feel free to add comments to existing issues. You're also welcome to participate to the [mailing list](https://groups.google.com/d/forum/devdocs).
74-
7566
## Coding conventions
7667

7768
* two spaces; no tabs
@@ -80,4 +71,4 @@ Besides new docs and features, here are other ways you can contribute:
8071

8172
## Questions?
8273

83-
If you have any questions, please feel free to ask on the [mailing list](https://groups.google.com/d/forum/devdocs).
74+
If you have any questions, please feel free to ask them on the contributor chat room on [Gitter](https://gitter.im/FreeCodeCamp/DevDocs).

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

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

.github/no-response.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
daysUntilClose: 30
2+
responseRequiredLabel: needs-info
3+
closeComment: >
4+
This issue has been automatically closed because there has been no response
5+
to our request for more information from the original author. With only the
6+
information that’s currently in the issue, we don’t have enough information
7+
to take action. Please comment if you have or find the answer we need so we
8+
can investigate further.

.gitignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
.DS_Store
22
.bundle
3-
*.pxm
4-
*.sketch
53
tmp
64
public/assets
75
public/fonts
86
public/docs/**/*
9-
!public/docs/docs.json
10-
!public/docs/**/index.json
11-
log
7+
docs/**/*
8+
!docs/*.md

.ruby-version

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

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
language: ruby
2+
3+
cache: bundler
4+
25
before_script:
36
- gem update --system
47
- gem install bundler

COPYRIGHT

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
Copyright 2013-2018 Thibaut Courouble and other contributors
1+
Copyright 2013-2019 Thibaut Courouble and other contributors
22

33
This Source Code Form is subject to the terms of the Mozilla Public
44
License, v. 2.0. If a copy of the MPL was not distributed with this
55
file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

77
Please do not use the name DevDocs to endorse or promote products
8-
derived from this software without my permission, except as may be
9-
necessary to comply with the notice/attribution requirements.
8+
derived from this software without the maintainers' permission, except
9+
as may be necessary to comply with the notice/attribution requirements.
1010

11-
I also wish that any documentation file generated using this software
11+
We also wish that any documentation file generated using this software
1212
be attributed to DevDocs. Let's be fair to all contributors by giving
1313
credit where credit's due. Thanks.

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ruby:2.5.1
1+
FROM ruby:2.6.0
2+
3+
ENV LANG=C.UTF-8
24

35
WORKDIR /devdocs
46

Dockerfile-alpine

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ruby:2.5.1-alpine
1+
FROM ruby:2.6.0-alpine
2+
3+
ENV LANG=C.UTF-8
24

35
WORKDIR /devdocs
46

0 commit comments

Comments
 (0)