Commit 9dc6d332 authored by Job van der Voort's avatar Job van der Voort 🚀

Merge branch 'rfr-update-8.14' into 'master'

Update www-gitlab-com with 8.14

See merge request !3951
parents f8b972eb 739cb640
Pipeline #5138786 passed with stages
in 9 minutes and 44 seconds
......@@ -12,6 +12,8 @@
- description: Cycle Analytics
link: https://docs.gitlab.com/ce/user/project/cycle_analytics.html
in_ce: true
- description: Time Tracking
link: https://docs.gitlab.com/ee/workflow/time_tracking.html
- title: Extended authentication and authorization integration
features:
......@@ -106,6 +108,9 @@
- description: Integrate with Koding
link: https://docs.gitlab.com/ce/user/project/koding.html
in_ce: true
- description: ChatOps
link: https://docs.gitlab.com/ce/project_services/mattermost_slash_commands.html
in_ce: true
- title: Additional server management options
features:
......@@ -176,3 +181,6 @@
- description: Environments and deployments in CI
in_ce: true
link: https://docs.gitlab.com/ce/ci/environments.html
- description: Review Apps
in_ce: true
link: https://docs.gitlab.com/ce/ci/review_apps/index.html
......@@ -2,7 +2,7 @@ require 'oga'
require 'httparty'
VERSIONS = [
"8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3","8.2","8.1","8.0","7.14","7.13","7.12","7.11","7.10",
"8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3","8.2","8.1","8.0","7.14","7.13","7.12","7.11","7.10",
"7.9","7.8"
]
......@@ -16,7 +16,7 @@ class ReleaseList
base_url = 'https://about.gitlab.com'
dec = "##"
year = 2016
month = 10
month = 11
next_version = VERSIONS[0]
major_version = next_version.split(".").first
minor_version = next_version.split(".").last
......
......@@ -110,7 +110,7 @@ GitLab Enterprise Edition can have a geographically replicated instance,
so your remote teams don't have to wait for long downloads when cloning or
pulling from repositories.
[Geo is available as an Enterprise Edition option](https://about.gitlab.com/pricing/).
[Geo is available as an Enterprise Edition Product](https://about.gitlab.com/pricing/).
[Read the Geo docs for more information](http://docs.gitlab.com/ee/gitlab-geo/README.html)
......@@ -120,10 +120,17 @@ directory. This ensures that no one will work on or overwrite work that
can't be merged easily, for instance when working with art assets or
other non-text files.
[File locking is available as an Enterprise Edition option](https://about.gitlab.com/pricing/).
[File locking is available as an Enterprise Edition Product](https://about.gitlab.com/pricing/).
[Read the File Locking documentation](http://docs.gitlab.com/ee/user/project/file_lock.html#sts=File Lock)
## Time Tracking
Time Tracking in GitLab Enterprise Edition lets your team add estimates and record
time spent on issues and merge requests. There is no need to use external tools
anymore.
[Time Tracking is available as an Enterprise Edition Product](https://about.gitlab.com/features/time-tracking/)
### Use the most installed on-premises Git solution
GitLab is used by over 100,000 organizations worldwide, on their own servers.
......
......@@ -45,6 +45,16 @@ The milestone, as seen below, is the intended date that the listed features get
<%= direction %>
## Next Products
Below is the list of Products we are working on. These Products will be available
for GitLab Enterprise Edition. The higher the item on the list, the sooner we expect
to ship it.
* [GitLab Geo Disaster Recovery](https://gitlab.com/gitlab-org/gitlab-ee/issues/846)
* [Time Tracking](https://gitlab.com/gitlab-org/gitlab-ee/issues/1293)
* [License Finder](https://gitlab.com/gitlab-org/gitlab-ee/issues/1125)
## Wishlist <a name="wishlist"></a>
Below are features we'd really like to see in GitLab.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment