Commit e1c8b657 authored by William Chia's avatar William Chia

Merge branch '3171-organize-support-pages' into 'master'

Resolve "Organize support pages"

Closes #3171

See merge request !15736
parents efc0606c 2ee80cc0
Pipeline #34056200 passed with stages
in 27 minutes and 35 seconds
......@@ -1353,7 +1353,7 @@ features:
- title: "4-business-hour standard support response time"
description: "Get the support you need. Our team of highly-skilled support engineers are available to help with all of your support needs."
link_description: "Learn more about our Premium Support"
link: /features/premium-support/
link: /support/#premium-support
category:
- unknown
pricing_page: true
......@@ -1365,7 +1365,7 @@ features:
- title: "24/7 emergency support"
description: "GitLab responds within 30 minutes to any emergency."
link_description: "Learn more about our Premium Support"
link: /features/premium-support/
link: /support/#premium-support
category:
- unknown
pricing_page: true
......@@ -2349,7 +2349,7 @@ features:
- title: "Live upgrade assistance"
description: "Schedule an upgrade time with GitLab. We’ll join a live screen share to help you through the process to ensure there aren't any surprises."
link_description: "Learn more about our Premium Support"
link: /features/premium-support/
link: /support/#premium-support
gitlab_com: false
category:
- unknown
......@@ -5009,7 +5009,7 @@ features:
tfs_vsts: false
- title: "Merge request reviews"
description: |
Write multiple saved draft comments in a merge request code review, before
Write multiple saved draft comments in a merge request code review, before
submitting them together all at once. This allows you to review code in
consistent, and self-contained sessions, instead of as individual comments.
link_description: "Learn more about batch comments in merge requests"
......
......@@ -40,19 +40,19 @@ extra_css:
%a.community-item{href: "/community/issue-bash/"}
%img{src: "/images/community/community-bash.svg"}
.community-item-info
%h4 Issue Bash
%p Quarterly Community Event.
%h4 Issue bash
%p Quarterly community event.
.flex-container.community-content-row
%a.community-item{href: "/documentation/"}
%img{src: "/images/community/community-docs.svg"}
.community-item-info
%h4 Documentation
%p All GitLab projects in one place.
%a.community-item{href: "/getting-help/"}
%a.community-item{href: "/get-help/"}
%img{src: "/images/community/community-help.svg"}
.community-item-info
%h4 Getting Help
%p How to get help and stay informed.
%h4 Get help
%p How to get technical and account support.
%a.community-item{href: "/partners/"}
%img{src: "/images/community/community-apps.svg"}
.community-item-info
......@@ -72,5 +72,5 @@ extra_css:
%a.community-item{href: "/mvp/"}
%img{src: "/images/community/community-hof.svg"}
.community-item-info
%h4 Hall of Fame
%h4 Hall of fame
%p The most valuable persons in past releases.
......@@ -85,11 +85,11 @@ extra_css:
-# %p.hint-message *If you subscribe, you will receive notifications about security updates.
%a.switch-forms{ href: "#newsletter" } Go to the newsletter sign up
.flex-container.community-content-row
%a.community-item{href: "/getting-help/"}
%a.community-item{href: "/get-help/"}
%img{src: "/images/community/community-help.svg"}
.community-item-info
%h4 Getting Help
%p How to get help and stay informed.
%h4 Get help
%p How to get technical and account support.
%a.community-item{href: "/sales/"}
%img{src: "/images/contact/contact-sales.svg"}
.community-item-info
......@@ -104,7 +104,7 @@ extra_css:
%a.community-item{href: "/company/visiting/"}
%img{src: "/images/contact/contact-office.svg"}
.community-item-info
%h4 Visit Our Office
%h4 Visit our office
%p How to visit our office in San Francisco.
%a.community-item{href: "/security/disclosure/"}
%img{src: "/images/contact/contact-security.svg"}
......@@ -125,5 +125,5 @@ extra_css:
%a.community-item{href: "/press/"}
%img{src: "/images/contact/contact-press.svg"}
.community-item-info
%h4 Press Inquiries
%h4 Press inquiries
%p Information on press-related inquiries.
......@@ -11,4 +11,4 @@ cannonical_path: "/company/contact/"
%a{ href: "#{path}" } https://about.gitlab.com#{path}
:javascript
window.location.replace("#{path}")
\ No newline at end of file
window.location.replace("#{path}")
......@@ -219,7 +219,7 @@ extra_css:
%ul
%li
Please see
%a{href: "/getting-help/"} Getting help for GitLab
%a{href: "/get-help/"} Get help for GitLab
if you have questions
%li
View a step-by-step guide to
......
---
layout: feature
title: Premium Support
description: GitLab's Premium Support feature, included in the GitLab Enterprise Edition Premium plan, lets you focus on building your product not on debugging your tools.
suppress_header: true
extra_css:
- gitlab-feature-landing-page.css
- features.css
layout: blank
title: Redirecting
cannonical_path: "/support/#premium-support"
---
.wrapper.gitlab-ee-page
= partial "includes/features/gitlab-ee-nav"
.image-title
.color-bg
%div
%h1 Premium Support
%h3#ci-subt Focus on building your product not on debugging your tools.
.sub-wrapper
.container
.row.advantages
.col-xs-12.col-md-10.col-md-offset-1
%h2 Overview
%ul
%li
The best tools are intuitive. Simply working as expected. But no tool is perfect. There
will be times when you'll need to troubleshoot, or ask a real person important questions.
Premium Support gives your team a solution for all of your upgrading, scaling, and troubleshooting needs.
%li
Premium Support is included in the GitLab Enterprise Edition Premium plan.
%hr.divider/
- path = current_page.data.cannonical_path
.row
.col-md-3.col-md-offset-1.hidden-xs.hidden-sm
.ee-feature-icon
= icon("premium-support")
.col-xs-12.col-md-7
%h2 What's included?
%ul
%li
%b Tiered Support responses:
Our team of highly skilled support engineers will help with all of your support needs, based on the priorities below.
%table
%tbody
%tr
%td Production Application Unavailable (Emergency)
%td 30 Minutes
%tr
%td Highly Degraded
%td 4 hours
%tr
%td Medium Impact
%td 8 hours
%tr
%td Low Impact
%td 24 hours
%li
%b 24x7 emergency support:
GitLab responds within 30 minutes to any emergency.
%li
%b Support for High Availability (HA):
A Support Engineer will help you identify your specific HA needs and map out an architecture.
%li
%b Live upgrade assistance:
Schedule an upgrade time with GitLab. We’ll host a live screen share session to help you through the process
and ensure there aren't any surprises.
%hr.divider/
%p{ :style => "text-align: center; margin-top: 30px;" }
Redirecting to
%a{ href: "#{path}" } https://about.gitlab.com#{path}
.row
.col-xs-12.col-md-6.col-md-offset-1
%h2 Benefits
%ul
%li
%b Fast:
Our support priority levels makes sure that we are focusing on the right issues at the right time.
%li
%b Technical:
Our Support Engineers have strong technical backgrounds and are well-versed on GitLab. They'll work with you directly
to understand your unique challenges and find the best solutions.
%li
%b Reliable:
Our support team is spread out across the world, with members on every continent.
There will always be someone available to help, regardless of your time zone.
.hidden-xs.hidden-sm.col-md-4
%img.gitlab-raccoon-dog-image.hidden-xs{alt: "", src: "/images/logo.png"}/
%hr.divider/
.row
#support-impact.col-xs-12.col-md-10.col-md-offset-1
%h2 Definitions of Support Impact
%ul
%li
%b Urgent - GitLab is unavailable or completely unusable (Emergency)
If a GitLab server or cluster is not available, or otherwise unusable, an emergency ticket can be filed and our On-Call Support Engineer will respond within 30 minutes. Example: GitLab showing 502 errors for all users.
%li
%b High - GitLab is Highly Degraded (4 hours)
Significant Business Impact. Important GitLab features are unavailable, or extremely slowed, with no acceptable workaround. Implementation or production use of GitLab is continuing; however, there is a serious impact on productivity. Example: CI Builds are erroring and not completing successfully, and the software release process is significantly affected.
%li
%b Normal - There appears to be a bug preventing normal GitLab operation (12 hours)
Some Business Impact. Important GitLab features are unavailable, or somewhat slowed, but a workaround is available. GitLab use has a minor loss of operational functionality, regardless of the environment or usage. Example: A Known bug impacts the use of GitLab, but a workaround is successfully being used as a temporary solution.
%li
%b Low - Questions or Clarifications around features or documentation or deployments (24 hours)
Minimal Business Impact. Information, an enhancement, or documentation clarification is requested, but there is no impact on the operation of GitLab. Implementation or production use of GitLab is continuing and work is not impeded. Example: A question about enabling ElasticSearch.
= partial "includes/features/gitlab-ee-add-product", locals: { feature_name: "Premium Support" }
:javascript
window.location.replace("#{path}")
---
layout: markdown_page
title: Getting Help with GitLab
description: Get help with GitLab - technical support, information about updating your GitLab instance, feature proposals and bug tracking.
title: Get help with GitLab
description: Get info on technical support, updating your GitLab instance, feature proposals and bug tracking.
---
......
---
layout: blank
title: Redirecting
cannonical_path: "/get-help/"
---
- path = current_page.data.cannonical_path
%p{ :style => "text-align: center; margin-top: 30px;" }
Redirecting to
%a{ href: "#{path}" } https://about.gitlab.com#{path}
:javascript
window.location.replace("#{path}")
......@@ -124,7 +124,7 @@ If someone is asking for support in the omnibus-gitlab project, point them to th
```
Provided description seems to point to this issue not being related to this project. This can be the case when installation and `gitlab-ctl reconfigure` run went without issues, but your GitLab instance is still giving 500 error page with an error in the log.
For this reason, I will close this issue and you can check on how to find further help at the [GitLab website](/getting-help/).
For this reason, I will close this issue and you can check on [how to find further help](/get-help/) on the GitLab website.
/close
```
......
......@@ -65,7 +65,7 @@ Please refer to the priority as listed under [GitLab Workflow in the handbook](/
## GitLab.com Support Tracker
For issues specific to GitLab.com that have nothing to do with availability we have the [Support Tracker](https://gitlab.com/gitlab-com/support-forum/issues). This forum must also be checked periodically for new issues and to report back if an issue has been solved. Ensure that you assign the issue to yourself to enable you to keep track of the issue and also to enable other support engineers to easily pick on unassigned tasks at a glance. Some people use this forum to report issues they are having with their self hosted installation. In that case, you should refer them to the [CE issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) or to our [Getting Help](/getting-help/) page, depending on the issue they are having.
For issues specific to GitLab.com that have nothing to do with availability we have the [Support Tracker](https://gitlab.com/gitlab-com/support-forum/issues). This forum must also be checked periodically for new issues and to report back if an issue has been solved. Ensure that you assign the issue to yourself to enable you to keep track of the issue and also to enable other support engineers to easily pick on unassigned tasks at a glance. Some people use this forum to report issues they are having with their self hosted installation. In that case, you should refer them to the [CE issue tracker](https://gitlab.com/gitlab-org/gitlab-ce/issues) or to our [get hep](/get-help/) page, depending on the issue they are having.
## GitLab CE/EE/Omnibus Issue Trackers
......
......@@ -7,8 +7,8 @@
%li{class: ("active" if current_page.url == "/features/gitlab-geo/")}
%a{href: "/features/gitlab-geo"}
GitLab Geo
%li{class: ("active" if current_page.url == "/features/premium-support/")}
%a{href: "/features/premium-support"}
%li{class: ("active" if current_page.url == "/support/#premium-support")}
%a{href: "/support/#premium-support"}
Premium Support
-# %li{class: ("active" if current_page.url == "/features/file-locking/")}
-# %a{href: "/features/file-locking"}
......
......@@ -33,5 +33,5 @@
.col-xs-10.feature-contents
%h4 Premium Support
%p Support for all of your onboarding, training, upgrading and troubleshooting needs.
%a{href: "/features/premium-support/", class: "dark-background-link"}
%a{href: "/support/#premium-support", class: "dark-background-link"}
Learn more
......@@ -33,19 +33,21 @@
%li= link_to('Contribute', '/contributing/', :class => 'footer-nav-link')
%li= link_to('Partners', '/partners/', :class => 'footer-nav-link')
%li= link_to('Explore repositories', 'https://gitlab.com/explore', :class => 'footer-nav-link')
%li= link_to('Source Code', 'https://gitlab.com/groups/gitlab-org', :class => 'footer-nav-link')
%li= link_to('Source code', 'https://gitlab.com/groups/gitlab-org', :class => 'footer-nav-link')
%li= link_to('Shop', 'https://shop.gitlab.com', :class => 'footer-nav-link')
%li= link_to('Direction', '/direction/', :class => 'footer-nav-link')
%li= link_to('Contributors', 'http://contributors.gitlab.com/', :class => 'footer-nav-link')
%li= link_to('Core Team', '/core-team/', :class => 'footer-nav-link')
%li= link_to('Hall of Fame', '/mvp/', :class => 'footer-nav-link')
%li= link_to('Hall of fame', '/mvp/', :class => 'footer-nav-link')
%li= link_to('Resellers', '/resellers/', :class => 'footer-nav-link')
.col-sm-6.col-md-2.col-lg-2.footer-link-holder
%h3.footer-link-title Contact
%h3.footer-link-title Support
%ul.animated.footer-links
%li= link_to('Support', '/support/', :class => 'footer-nav-link')
%li= link_to('Get help', '/get-help/', :class => 'footer-nav-link')
%li= link_to('Contact Sales', '/sales/', :class => 'footer-nav-link')
%li= link_to('Get help', '/getting-help/', :class => 'footer-nav-link')
%li= link_to('Contact Support', '/support/#contact-support', :class => 'footer-nav-link')
%li= link_to('Support options', '/support/', :class => 'footer-nav-link')
%li= link_to('Status', 'https://status.gitlab.com/', :class => 'footer-nav-link')
.col-sm-6.col-md-2.col-lg-2.footer-link-holder
%h3.footer-link-title Company
%ul.animated.footer-links
......
......@@ -28,8 +28,12 @@
%a.main-nav-sub-link{href: "https://gitlab.com/groups/gitlab-org"} Source code
%a.main-nav-sub-link{href: "https://shop.gitlab.com"} Shop
%a.main-nav-sub-link{href: "/direction/"} Direction
%li{class: ("menu-item-active" if current_page.url == "/support/")}
%a.main-nav-link{href: "/support/"} Support
%li{class: ("menu-item-active" if current_page.url == "/get-help/")}
%a.main-nav-link{href: "/get-help/"} Get help
.dropdown
%a.main-nav-sub-link{href: "/sales/"} Contact Sales
%a.main-nav-sub-link{href: "/support/#contact-support"} Contact Support
%a.main-nav-sub-link{href: "/support/"} Support options
%li{class: ("menu-item-active" if current_page.url == "/pricing/")}
%a.main-nav-link{href: "/pricing/"} Pricing
.dropdown
......
......@@ -179,5 +179,5 @@ your involvement and you'll become more confident.
[1k-post]: /2016/05/24/1k-contributors/
[gdk-post]: /2016/06/08/getting-started-with-gitlab-development-kit/
[getting-help]: /getting-help/
[getting-help]: /get-help/
[contrib-guide]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md
......@@ -17,8 +17,9 @@ extra_js:
Please contact our sales team with any questions
about
%a{href: "/features/#enterprise"} GitLab
and someone will get back to you within one business day. If you need technical help, visit
%a{href: "/getting-help/"} Getting Help.
and someone will get back to you within one business day. If you need technical help, visit our
%a{href: "/support/#contact-support"} support
page.
%p If form does not render, please use <a href="https://www.google.com/chrome/" target="_blank">another browser</a>.
%script{src: "//app-ab13.marketo.com/js/forms2/js/forms2.min.js"}
......
This diff is collapsed.
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