Merge branch 'master' into 5.x

.gitattributes

@@ -30,3 +30,11 @@ gollum text
 # Denote all files that are truly binary and should not be modified.
 *.png binary
 *.jpg binary
+
+# Make github-linguist ignore files that aren't our own
+
+lib/gollum/public/gollum/* linguist-vendored
+lib/gollum/public/gollum/javascript/gollum* linguist-vendored=false
+lib/gollum/public/gollum/javascript/*/gollum* linguist-vendored=false
+lib/gollum/public/gollum/css linguist-vendored=false
+

.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+<<<<<<< HEAD
   - 2.4.0
   - 2.6.0
   - jruby-9.2.7.0

CONTRIBUTING.md

@@ -19,8 +19,17 @@ Before submitting an issue, **please carefully look through the following places
 1. The [README](https://github.com/gollum/gollum/blob/master/README.md).
 1. The project's [wiki](https://github.com/gollum/gollum/wiki).
 
+Security vulnerabilities can be reported directly to the maintainers using these GPG keys:
+
+* [@dometto](https://pgp.mit.edu/pks/lookup?op=vindex&search=0xD637E455CD3E27BF)
+
 Lastly, please **consider helping out** by opening a Pull Request!
 
+## Triaging Issues [![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
+
+You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to gollum on CodeTriage](https://www.codetriage.com/gollum/gollum).
+
+
 ## Opening a Pull Request
 
 Pull Requests fixing bugs, implementing new features, or updating documentation and dependencies are all very welcome! If you would like to help out with the project, you can pick an open issue from the issue tracker. We're more than happy to help you get started! Here's how you can proceed:

HISTORY.md

@@ -8,6 +8,18 @@ Many thanks to all the users who have provided feedback, and everyone who has ch
 
 Many of these changes have been made possible by removing the default grit adapter in favour of the new [rugged adapter](https://github.com/gollum/rugged_adapter).
 
+# 4.1.4 /2018-01-10
+
+* Depend on new version of gollum-lib that relies on a patched version of sanitize, which solves a vulnerability (CVE-2018-3740). See https://github.com/gollum/gollum-lib/pull/296.
+
+# 4.1.3 /2018-17-09
+
+* Solves a vulnerability in the File view and All Pages view that would allow XSS.
+
+# 4.1.2 /2017-08-07
+
+* Lock to a newer version of gollum-lib to avoid installing an outdated and vulnerable dependency (nokogiri) on ruby 2.0. See https://github.com/gollum/gollum-lib/pull/279. Note: this breaks semantic versioning so those using outdated rubies will discover the problem on update.
+
 # 4.1.0 /2017-03-09
 
 * Added file deletion functionality to file view

Home.md

@@ -0,0 +1 @@
+TEST

ISSUE_TEMPLATE.md

@@ -0,0 +1,7 @@
+**Note**: we are currently working on version 5.0 of gollum in an attempt to make it, better, faster, and easier to maintain. We will **not** be fixing issues with previous versions of gollum (4.x), except for security issues.
+
+Please submit only issues that are present in the `5.x` branch of this project. When submitting issues with `5.x`, please include the output of `gollum --versions` in your ticket. 
+
+Please read [these guidelines](https://github.com/gollum/gollum/blob/master/CONTRIBUTING.md) before submitting your issue, and for info on reporting vulnerabilities.
+
+Finally: we need your help! Please consider chipping in by submitting a PR rather than just by reporting your issue.

README.md

@@ -3,7 +3,7 @@ gollum -- A git-based Wiki
 
 [![Gem Version](https://badge.fury.io/rb/gollum.svg)](http://badge.fury.io/rb/gollum)
 [![Build Status](https://travis-ci.org/gollum/gollum.svg?branch=master)](https://travis-ci.org/gollum/gollum)
-[![Dependency Status](https://gemnasium.com/gollum/gollum.svg)](https://gemnasium.com/gollum/gollum)
+[![Open Source Helpers](https://www.codetriage.com/gollum/gollum/badges/users.svg)](https://www.codetriage.com/gollum/gollum)
 
 **Gollum version 5.0 is out!** See [here](https://github.com/gollum/gollum/wiki/5.0-release-notes) for a list of changes and new features compared to Gollum version 4.x. See some [Screenshots](https://github.com/gollum/gollum/wiki/Screenshots) of Gollum's features.
 
@@ -147,4 +147,4 @@ When `--config` option is used, certain inner parts of Gollum can be customized.
 
 ## CONTRIBUTING
 
-See [CONTRIBUTING](CONTRIBUTING.md) for information on how to submit issues, and how to start hacking on gollum.
+Please consider helping out! See [CONTRIBUTING](CONTRIBUTING.md) for information on how to submit issues, and how to start hacking on gollum.

gollum.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.name              = 'gollum'
   s.version           = '5.0.1b'
   s.date              = '2018-09-28'
-  s.rubyforge_project = 'gollum'
   s.license           = 'MIT'
 
   s.summary     = 'A simple, Git-powered wiki.'
@@ -52,6 +51,7 @@ Gem::Specification.new do |s|
     CONTRIBUTING.md
     Gemfile
     HISTORY.md
+    ISSUE_TEMPLATE.md
     LICENSE
     README.md
     Rakefile