diff options
| -rw-r--r-- | README.md | 10 | ||||
| -rw-r--r-- | ROADMAP.md | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/README.md b/README.md index 4d46851ec0c..e7a472de153 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,6 @@ ### Installation -Check out our [maintenance policy](MAINTENANCE.md) to see what versions are supported. - #### Official production installation * [Installation guide for a production server](https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/installation.md) @@ -137,18 +135,20 @@ Start it with [Foreman](https://github.com/ddollar/foreman) ### Getting help +* [Maintenance policy](MAINTENANCE.md) specifies what versions are supported. + * [Troubleshooting guide](https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide) contains solutions to common problems. * [Support forum](https://groups.google.com/forum/#!forum/gitlabhq) is the best place to ask questions. For example you can use it if you have questions about: permission denied errors, invisible repos, can't clone/pull/push or with web hooks that don't fire. Please search for similar issues before posting your own, there's a good chance somebody else had the same issue you have now and had it resolved. There are a lot of helpful GitLab users there who may be able to help you quickly. If your particular issue turns out to be a bug, it will find its way from there to a fix. * [Feedback and suggestions forum](http://feedback.gitlab.com) is the place to propose and discuss new features for GitLab. -* [Support subscription](http://www.gitlab.com/subscription/) connect you to the knowledge of GitLab experts that will resolve your issues and answer your questions. +* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed. + +* [Support subscription](http://www.gitlab.com/subscription/) connects you to the knowledge of GitLab experts that will resolve your issues and answer your questions. * [Consultancy](http://www.gitlab.com/consultancy/) allows you hire GitLab experts for installations, upgrades and customizations. -* [Contributing guide](https://github.com/gitlabhq/gitlabhq/blob/master/CONTRIBUTING.md) describes how to submit pull requests and issues. Pull requests and issues not in line with the guidelines in this document will be closed. - ### Getting in touch diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index 879064dc719..00000000000 --- a/ROADMAP.md +++ /dev/null @@ -1,5 +0,0 @@ -## GitLab Roadmap - -Features that will be in the next release are listed on [the feedback and suggestions forum with the status "started"](http://feedback.gitlab.com/forums/176466-general/status/796456) as specified in the README. - -This ROADMAP file will be deprecated. |