Merge branch 'master' into generate-docs-json

Author: jmerle

CONTRIBUTING.md .github/CONTRIBUTING.mdCONTRIBUTING.md renamed to .github/CONTRIBUTING.md

@@ -27,8 +27,6 @@ Want to contribute? Great. Please review the following guidelines carefully and
 2. Make sure your feature fits DevDocs's [vision](https://github.com/freeCodeCamp/devdocs/blob/master/README.md#vision).
 3. Provide a clear and detailed explanation of the feature and why it's important to add it.
 
-For general feedback and ideas, please use the [mailing list](https://groups.google.com/d/forum/devdocs).
-
 ## Requesting new documentations
 
 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
 ## Contributing code and features
 
 1. Search for existing issues; someone may already be working on a similar feature.
-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.
+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.
 3. Follow the [coding conventions](#coding-conventions).
 4. If you're modifying the Ruby code, include tests and ensure they pass.
 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
 
 To ask that an existing documentation be updated, please use the [Trello board](https://trello.com/c/2B0hmW7M/52-request-updates-here).
 
-## Other contributions
-
-Besides new docs and features, here are other ways you can contribute:
-
-* **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.
-* **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).
-
 ## Coding conventions
 
 * two spaces; no tabs
@@ -80,4 +71,4 @@ Besides new docs and features, here are other ways you can contribute:
 
 ## Questions?
 
-If you have any questions, please feel free to ask on the [mailing list](https://groups.google.com/d/forum/devdocs).
+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 .github/ISSUE_TEMPLATE.mdISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 <!--
   Please read the contributing guidelines before opening an issue:
-  https://github.com/freeCodeCamp/devdocs/blob/master/CONTRIBUTING.md
+  https://github.com/freeCodeCamp/devdocs/blob/master/.github/CONTRIBUTING.md
 
   To request a new documentation, or an update of an existing documentation, go here:
   https://trello.com/b/6BmTulfx/devdocs-documentation

.github/no-response.yml

@@ -0,0 +1,8 @@
+daysUntilClose: 30
+responseRequiredLabel: needs-info
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that’s currently in the issue, we don’t have enough information
+  to take action. Please comment if you have or find the answer we need so we
+  can investigate further.

.gitignore

@@ -1,8 +1,8 @@
 .DS_Store
 .bundle
-*.pxm
-*.sketch
 tmp
 public/assets
 public/fonts
-public/docs
+public/docs/**/*
+docs/**/*
+!docs/*.md

.ruby-version

@@ -1 +1 @@
-2.5.1
+2.6.0

.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+
+cache: bundler
+
 before_script:
   - gem update --system
   - gem install bundler

COPYRIGHT

@@ -1,13 +1,13 @@
-Copyright 2013-2018 Thibaut Courouble and other contributors
+Copyright 2013-2019 Thibaut Courouble and other contributors
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 Please do not use the name DevDocs to endorse or promote products
-derived from this software without my permission, except as may be
-necessary to comply with the notice/attribution requirements.
+derived from this software without the maintainers' permission, except
+as may be necessary to comply with the notice/attribution requirements.
 
-I also wish that any documentation file generated using this software
+We also wish that any documentation file generated using this software
 be attributed to DevDocs. Let's be fair to all contributors by giving
 credit where credit's due. Thanks.

Dockerfile

@@ -1,4 +1,6 @@
-FROM ruby:2.5.1
+FROM ruby:2.6.0
+
+ENV LANG=C.UTF-8
 
 WORKDIR /devdocs
 

Dockerfile-alpine

@@ -1,4 +1,6 @@
-FROM ruby:2.5.1-alpine
+FROM ruby:2.6.0-alpine
+
+ENV LANG=C.UTF-8
 
 WORKDIR /devdocs
 

Gemfile

@@ -1,16 +1,20 @@
 source 'https://rubygems.org'
-ruby '2.5.1'
+ruby '2.6.0'
 
 gem 'rake'
 gem 'thor'
-gem 'pry', '~> 0.11.0'
+gem 'pry', '~> 0.12.0'
 gem 'activesupport', '~> 5.2', require: false
 gem 'yajl-ruby', require: false
+gem 'html-pipeline'
+gem 'typhoeus'
+gem 'nokogiri'
 
 group :app do
   gem 'rack'
   gem 'sinatra'
   gem 'sinatra-contrib'
+  gem 'rack-ssl-enforcer'
   gem 'thin'
   gem 'sprockets'
   gem 'sprockets-helpers'
@@ -30,14 +34,12 @@ group :development do
 end
 
 group :docs do
-  gem 'typhoeus'
-  gem 'nokogiri'
-  gem 'html-pipeline'
   gem 'image_optim'
   gem 'image_optim_pack', platforms: :ruby
   gem 'progress_bar', require: false
   gem 'unix_utils', require: false
   gem 'tty-pager', require: false
+  gem 'net-sftp', '>= 2.1.3.rc2', require: false
 end
 
 group :test do