Rubocop fixes for ruby 2.5

[rails.git] / README.md

diff --git a/README.md b/README.md
index 90a9b93ef4af7e8fbeb141c4c3a32a382ec029d0..9162a38de691c33a979bfa68938c9bebb339fe50 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,24 +1,27 @@
 # "The Rails Port"
 
 # "The Rails Port"
 

+[![Build Status](https://travis-ci.org/openstreetmap/openstreetmap-website.svg?branch=master)](https://travis-ci.org/openstreetmap/openstreetmap-website)
+[![Coverage Status](https://coveralls.io/repos/openstreetmap/openstreetmap-website/badge.svg?branch=master)](https://coveralls.io/r/openstreetmap/openstreetmap-website?branch=master)
+

 This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/)
 This is The Rails Port, the [Ruby on Rails](http://rubyonrails.org/)

-application that powers the [OpenStreetMap](http://www.openstreetmap.org) website and API.
+application that powers the [OpenStreetMap](https://www.openstreetmap.org) website and API.

 The software is also known as "openstreetmap-website".
 
 This repository consists of:
 
 * The web site, including user accounts, diary entries, user-to-user messaging
 The software is also known as "openstreetmap-website".
 
 This repository consists of:
 
 * The web site, including user accounts, diary entries, user-to-user messaging

-* The XML-based editing [API](http://wiki.openstreetmap.org/wiki/API_v0.6)
-* The integrated versions of the [Potlatch](http://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](http://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](http://wiki.openstreetmap.org/wiki/ID) editors
+* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6)
+* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors

 * The Browse pages - a web front-end to the OpenStreetMap data
 * The GPX uploads, browsing and API.
 
 A fully-functional Rails Port installation depends on other services, including map tile
 servers and geocoding services, that are provided by other software. The default installation
 * The Browse pages - a web front-end to the OpenStreetMap data
 * The GPX uploads, browsing and API.
 
 A fully-functional Rails Port installation depends on other services, including map tile
 servers and geocoding services, that are provided by other software. The default installation

-uses publically-available services to help with development and testing.
+uses publicly-available services to help with development and testing.

 
 # License
 
 
 # License
 

-This software is licensed under the [GNU General Public License 2.0](http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt),
+This software is licensed under the [GNU General Public License 2.0](https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt),

 a copy of which can be found in the [LICENSE](LICENSE) file.
 
 # Installation
 a copy of which can be found in the [LICENSE](LICENSE) file.
 
 # Installation


@@ -33,8 +36,12 @@ We're always keen to have more developers! Pull requests are very welcome.
 * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).
 * Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components
 * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap)
 * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues).
 * Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components
 * Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap)

-* There is a [rails-dev@openstreetmap.org](http://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.
+* There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion.

 * IRC - there is the #osm-dev channel on irc.oftc.net.
 * IRC - there is the #osm-dev channel on irc.oftc.net.

-* There are also weekly meetings of the OpenStreetMap Foundation Engineering Working Group (EWG) on Mondays at 1700 UTC on the #osm-ewg channel.

 
 More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file.
 
 More details on contributing to the code are in the [CONTRIBUTING.md](CONTRIBUTING.md) file.

+
+# Maintainers
+
+* Tom Hughes [@tomhughes](https://github.com/tomhughes/)
+* Andy Allan [@gravitystorm](https://github.com/gravitystorm/)