Verified Commit bd8d5718 authored by Michal Wasilewski's avatar Michal Wasilewski

Merge branch 'master' into mwasilewski-team-page

parents ebd94e02 4f52eb23
Pipeline #46343916 passed with stages
in 13 minutes and 16 seconds
{
"extends": "eslint-config-es5",
"parserOptions": {
"ecmaVersion": 6
},
"globals": {
"$": true,
"jQuery": true,
......
# Categories that GitLab has offerings in. Drives /handbook/product/categories
# FORMAT
#
# category_slug:
# name: # "name"
# stage: # stage_slug
# alt_link: # link towards category epic or marketing product page
# documentation: # link towards documentation
# vision: # link towards category epic for stage vision
# description: |
# # Category description
# roi: # true/false
# available: # date YYYY-MM-DD
# viable: # date YYYY-MM-DD
# complete: # date YYYY-MM-DD
# lovable: # date YYYY-MM-DD
# Format description and documentation for this file is in the handbook https://about.gitlab.com/handbook/marketing/website/#adding-categories-to-the-website
# Manage
......@@ -388,6 +374,15 @@ source_code_management:
* Want to know where we're headed? [Learn about the future of Source Code Management](/2018/09/21/create-vision/)
search:
name: Search
stage: create
description: "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project. GitLab leverages the search capabilities of Elasticsearch"
alt_link: https://docs.gitlab.com/ee/user/search/advanced_global_search.html
documentation: https://docs.gitlab.com/ee/user/search/advanced_global_search.html
roi: false
# available: 2017-01-01
code_review:
name: "Code Review"
stage: create
......
......@@ -36,6 +36,9 @@
- country: Spain
employee_factor: 1
entity: Safeguard - Spain
- country: France
employee_factor: 1
entity: Safeguard - France
- country: Brazil
employee_factor: 1
entity: Safeguard - Brazil
......
......@@ -6,22 +6,46 @@ dev:
cm: Erica Lindberg
tw: Mike Lewis
ops:
name: "Ops"
vpr:
name: "Verify, Package, and Release"
pm: Kenny Johnston
em: Dalia Havens
pmm: William Chia
cm: Erica Lindberg
tw: Mike Lewis
sec:
name: "Sec"
cm:
name: "Configure and Monitor"
pm: Kenny Johnston
em: Dalia Havens
pmm: William Chia
cm: Erica Lindberg
tw: Mike Lewis
secure:
name: "Secure"
pm: Kenny Johnston
em: Dalia Havens
pmm: Cindy Blake
cm: Erica Lindberg
tw: Mike Lewis
defend:
name: "Defend"
pm: Kenny Johnston
em: Dalia Havens
pmm: Cindy Blake
cm: Erica Lindberg
tw: Mike Lewis
growth:
name: "Growth"
pm: Eric Brinkman
em: Tommy Morgan
pmm: Ashish Kuthiala
cm: Erica Lindberg
tw: Mike Lewis
enablement:
name: "Enablement"
pm: Eric Brinkman
......
......@@ -18,92 +18,6 @@
social_tags: GirlsGetGeeky
event_url: https://girlsgetgeeky.com/
- topic: GitLab product demo and live Q&A
type: Webcast
date: January 9, 2019
date_ends: January 9, 2019
description: |
Join us for a 30-minute session where a product marketing manager will demo a change through the entire DevOps lifecycle using GitLab from Planning to Monitoring, with a live Q&A!
location: Webcast, Zoom
region: Online
social_tags: WeeklyDemo
event_url: https://about.gitlab.com/webcast/weekly-demo/
- topic: GitLab product demo and live Q&A
type: Webcast
date: January 16, 2019
date_ends: January 16, 2019
description: |
Join us for a 30-minute session where a product marketing manager will demo a change through the entire DevOps lifecycle using GitLab from Planning to Monitoring, with a live Q&A!
location: Webcast, Zoom
region: Online
social_tags: WeeklyDemo
event_url: https://about.gitlab.com/webcast/weekly-demo/
- topic: GitLab product demo and live Q&A
type: Webcast
date: January 23, 2019
date_ends: January 23, 2019
description: |
Join us for a 30-minute session where a product marketing manager will demo a change through the entire DevOps lifecycle using GitLab from Planning to Monitoring, with a live Q&A!
location: Webcast, Zoom
region: Online
social_tags: WeeklyDemo
event_url: https://about.gitlab.com/webcast/weekly-demo/
- topic: Django Girls Kanpur
type: Conference
date: January 27, 2019
date_ends: January 27, 2019
description: |
Django Girls Provides a Free Programming Workshop that teaches Women to code in Python and the Django Framework.
region: EMEA
social_tags: #GitLabDiversity
event_url: https://djangogirls.org/kanpur/
- topic: Cloud Native Live 2019
type: Conference
date: January 29, 2019
date_ends: January 29, 2019
description: |
The first online event dedicated to building, running and securing cloud native applications. We’re looking for speakers, sponsors, attendees, and those who just want to listen into the conversation about the cloud native ecosystem.
location: Virtual
region: Online
social_tags: CloudNativeLive2019
event_url: https://www.cloudnativelive.com/
- topic: GitLab product demo and live Q&A
type: Webcast
date: January 30, 2019
date_ends: January 30, 2019
description: |
Join us for a 30-minute session where a product marketing manager will demo a change through the entire DevOps lifecycle using GitLab from Planning to Monitoring, with a live Q&A!
location: Webcast, Zoom
region: Online
social_tags: WeeklyDemo
event_url: https://about.gitlab.com/webcast/weekly-demo/
- topic: Git Merge 2019
type: Conference
date: Feb 1, 2019
date_ends: February 1, 2019
description: |
The preeminent Git-focused conference. Git Merge is a full-day offering technical content and user case studies, plus a day of workshops for Git users of all levels.
location: Brussels, Belgium
region: EMEA
social_tags: GitMerge
event_url: https://git-merge.com/
- topic: Django Girls Cape Coast
type: Conference
date: February 1-2, 2019
date_ends: February 2, 2019
description: |
Django Girls Provides a Free Programming Workshop that teaches Women to code in Python and the Django Framework.
region: EMEA
social_tags: #GitLabDiversity
event_url: https://djangogirls.org/capecoast/
- topic: Interaction 19
type: Conference
date: February 3-8, 2019
......@@ -198,27 +112,6 @@
social_tags: TriAgile
event_url: https://triagile.com/
- topic: TouraineTech 2019
type: Conference
date: February 1, 2019
date_ends: February 1, 2019
description: Central Region Technical Conference on New Digital Technologies
location: Tours, France
region: EMEA
social_tags: tourainetech
event_url: https://touraine.tech/
- topic: FOSDEM 2019
type: Conference
date: February 2-3, 2019
date_ends: February 3, 2019
description: |
FOSDEM is a free event for software developers to meet, share ideas and collaborate. Every year, thousands of developers of free and open source software from all over the world gather at the event in Brussels. Come visit the GitLab stand in Building K/Level 2.
location: Brussels, Belgium
region: EMEA
social_tags: fosdem
event_url: https://fosdem.org/2019/
- topic: GitLab product demo and live Q&A
featured:
background: /images/demo/demo-background-red.png
......@@ -277,17 +170,6 @@
social_tags: gitlab
event_url: https://register.gotowebinar.com/register/6565462501486150403
- topic: Devopsdays New York City
type: Conference
date: January 24-25, 2019
date_ends: January 25, 2019
description: |
devopsdays is a worldwide community conference series for anyone interested in IT improvement.
location: New York City
region: NORAM
social_tags: devopsdaysNYC
event_url: https://www.devopsdays.org/events/2019-new-york-city/welcome/
- topic: GitLab product demo and live Q&A
type: Webcast
date: February 20, 2019
......@@ -362,6 +244,26 @@
social_tags: DrupalCon
event_url: https://events.drupal.org/seattle2019
- topic: GitLab Connect Dallas
type: GitLab Connect
date: March 19, 2019
date_ends: March 19, 2019
description: |
Join us at TopGolf Dallas in this workshop covering real-life DevOps transformation stories as well as an interactive discussion on the difficulties and importance of getting started and moving forward on your DevOps journey.
location: Dallas, TX
region: NORAM
event_url: https://about.gitlab.com/events/gitlab-connect-dallas/
- topic: GitLab Connect San Francisco
type: GitLab Connect
date: February 28, 2019
date_ends: February 28, 2019
description: |
Join Gitlab and General Catalyst for good food, libations, and a moderated panel discussion on real-life DevSecOps transformation challenges and success stories.
location: San Francisco, CA
region: NORAM
event_url: https://about.gitlab.com/events/gitlab-connect-san-francisco/
- topic: Google Cloud Next
type: Conference
date: April 9-11, 2019
......@@ -524,6 +426,16 @@ The rise of Infrastructure as Code, which is at the heart of DevOps, highlights
topic: "Details to Come"
description: "Details to Come"
- topic: Velocity San Jose 2019
type: Conference
date: June 10-13, 2019
date_ends: June 13, 2019
description: |
Performance. Resilience. Security. Get expert insight on building and maintaining cloud native systems.
region: NORAM
social_tags: Velocity2019
event_url: https://conferences.oreilly.com/velocity/vl-ca
- topic: DevOps Enterprise Summit London
type: Conference
date: June 25-27, 2019
......
This diff is collapsed.
......@@ -233,7 +233,7 @@ devops_tools:
asana:
name: 'Asana'
logo: '/images/devops-tools/asana-logo.png'
include_file: devops-tools/dynatrace/index.html.md
include_file: devops-tools/asana/index.html.md
category:
- project_management
azure_devops:
......@@ -5841,15 +5841,15 @@ features:
electric_flow: false
- title: "IP Whitelisting"
description: "IP Whitelisting defines safe IP network addresses from which clients can access and interact with the repository server. This helps prevent unwanted third parties from accessing your account even if they have acquired a team member’s email address and password."
link_description: "Learn more about GitLab IP Whitelisting"
link: https://docs.gitlab.com/ee/administration/monitoring/ip_whitelist.html
link_description: "See the GitLab issue to implement this"
link: https://gitlab.com/gitlab-org/gitlab-ee/issues/1985
category:
- source_code_management
- authentication_and_authorization
gitlab_core: true
gitlab_starter: true
gitlab_premium: true
gitlab_ultimate: true
gitlab_core: false
gitlab_starter: false
gitlab_premium: false
gitlab_ultimate: false
gitlab_com: false
bitbucket: true
electric_flow: false
......
......@@ -160,9 +160,11 @@
landing: false
industry_type: 'technology'
- name: ESA
logo: /images/organizations/logo_esa.svg
logo: /images/organizations/esa_logo_gray.svg
landing: false
industry_type: 'science'
asset_type: case-study
asset_link: /customers/european-space-agency
- name: Euronext
logo: /images/organizations/logo_euronext.svg
landing: false
......
......@@ -150,10 +150,10 @@
picture: rosa.jpg
human: nick.thomas
story: Rosa started life in Spain, but moved to Shetland via a dog rescue scheme. She loves to play with Cedric, and goes absolutely mad for the beach. Chewing things is also high up on her priority list - so far, she's eaten several dressing gowns and a duvet.
- name: Harley
picture: harley.jpg
human: chloe
story: Harley's nickname is Pancake, because she loves to squeeze herself under furniture that is incredibly close the ground. She loves to eat, so her owners can never keep food out or she'll eat it all at once. She is a scaredy-cat but also master of the household, and even has her own office chair between her two owners.
- name: Harley & Ozzy
picture: harleyozzy.jpg
human: Chloe
story: Harley's nickname is Pancake, because she loves to squeeze herself under furniture that is incredibly close the ground. Ozzy's real name is Oswald but we call him Fluffernutter, because he is incredibly fluffy and also pretty nutty. They both love to eat, so their owners can never leave (cat or people) food out. Harley is a scaredy-cat but also master of the household, and Ozzy loves to chew on cardboard and zoom around the house at precisely 10pm. They share custody of an office chair between their two owners and can often be found in collusion against Batman.
- name: Tilly
picture: tilly.jpg
human: joel.krooswyk
......@@ -253,7 +253,7 @@
- name: Zera
picture: zera.jpg
human: Paul Harrison
story: Zera is a lab/collie rescue, lover of walks, master of the bed, will always try (and fail) to catch the rabbit.
story: Zera is a lab/collie rescue, lover of walks, master of the bed, will always try (and fail) to catch the rabbit.
- name: Blacky
picture: blacky.jpg
human: Matej latin
......@@ -373,7 +373,7 @@
- name: Helena
picture: helena.png
human: Luca Williams
story: Helena is possibly male, not sure. Anyway, she came with four other fish like her (the others got stuck in the filter), four shrimp, and three bettas. Everyone else died except her (I tried so hard, honestly, I don't know what I did wrong, I'm half convinced she did it) and two of the shrimp - they are called Alfred and Jarvis. I named her Helena after [the character in Orphan Black](http://orphanblack.wikia.com/wiki/Helena).
story: Helena is possibly male, not sure. Anyway, she came with four other fish like her (the others got stuck in the filter), four shrimp, and three bettas. Everyone else died except her (I tried so hard, honestly, I don't know what I did wrong, I'm half convinced she did it) and two of the shrimp - they are called Alfred and Jarvis. I named her Helena after [the character in Orphan Black](http://orphanblack.wikia.com/wiki/Helena).
- name: Sadie
picture: sadieu.jpg
human: Jeff Burrows
......@@ -422,7 +422,7 @@
- name: Sadie
picture: sadiegolden.jpg
human: Betsy Church
story: Sadie is a 10-week-old Golden Retriever puppy who loves to eat her mom's hands, sticks, treats, her own tail, and generally anything else on the ground. She loves meeting new friends, and is quick to bark "hello" everytime mom gets on a video call.
story: Sadie is a 10-week-old Golden Retriever puppy who loves to eat her mom's hands, sticks, treats, her own tail, and generally anything else on the ground. She loves meeting new friends, and is quick to bark "hello" everytime mom gets on a video call.
- name: You?
picture: ../../gitlab-logo-extra-whitespace.png
story: |
......
......@@ -10,47 +10,47 @@ releases:
manager: --
structural_check: --
copy_edit: rebecca
messaging: TinaS
messaging: blake
social: evhoffmann
- version: "12.1"
date: "2019-7-22"
manager: --
structural_check: --
copy_edit: rebecca
messaging: cblake
messaging: williamchia
social: evhoffmann
- version: "12.0"
date: "2019-6-22"
manager: --
structural_check: --
copy_edit: rebecca
messaging: williamchia
messaging: johnjeremiah
social: evhoffmann
- version: "11.11"
date: "2019-5-22"
manager: --
structural_check: --
copy_edit: rebecca
messaging: johnjeremiah
messaging: TinaS
social: evhoffmann
- version: "11.10"
date: "2019-4-22"
manager: --
structural_check: TinaS
structural_check: marcia
copy_edit: rebecca
messaging: cblake
social: evhoffmann
- version: "11.9"
date: "2019-3-22"
manager: kencjohnston
structural_check: --
structural_check: eread
copy_edit: rebecca
messaging: williamchia
social: evhoffmann
- version: "11.8"
date: "2019-2-22"
manager: joshlambert
structural_check: --
structural_check: axil
copy_edit: rebecca
messaging: johnjeremiah
social: evhoffmann
......
......@@ -573,7 +573,8 @@ features:
Git protocol v2 is supported from Git v2.18.0 and is opt-in. To enable
globally run `git config --global protocol.version 2`. Git protocol v2
over SSH is not yet enabled on GitLab.com and must be enabled manually.
over SSH is not yet enabled on GitLab.com and must be enabled manually
for self-hosted installations.
- name: "Geo UX improvements in Admin Area"
available_in: [premium, ultimate]
......
- title: 'A seismic shift in application security'
url: /resources/whitepaper-seismic-shift-application-security/
image: /images/resources/security.png
type: 'White paper'
topics:
- Security
solutions:
- Security and quality
- Distributed teams
teaser:
- title: Bridging the divide between developers and management
url: /resources/whitepaper-bridging-the-divide/
image: /images/resources/gitlab.png
......
......@@ -342,7 +342,7 @@
- title: "Product Operations"
description: /job-families/product/product-operations/
levels: basic
salary: 122000
salary: 139000
apply:
open: false
......
......@@ -4,6 +4,7 @@ stages:
manage:
display_name: "Manage"
marketing: true
image: "/images/solutions/solutions-manage.png"
description: "Gain visibility and insight into how your business is performing."
body: |
......@@ -44,8 +45,10 @@ stages:
- code_analytics
framework:
name: Framework
plan:
display_name: "Plan"
marketing: true
image: "/images/solutions/solutions-plan.png"
description: "Regardless of your process, GitLab provides powerful planning
tools to keep everyone synchronized."
......@@ -65,6 +68,7 @@ stages:
backend_engineering_manager: Sean McGivern
frontend_engineering_manager: André Luís
ux: Pedro Moreira da Silva
tech_writer: Mike Lewis
groups:
team_planning:
name: Team Planning
......@@ -86,6 +90,7 @@ stages:
create:
display_name: "Create"
marketing: true
image: "/images/solutions/solutions-create.png"
description: "Create, view, and manage code and project data through powerful branching tools."
body: |
......@@ -115,6 +120,7 @@ stages:
categories:
- source_code_management
- snippets
- search
editor:
name: Editor
categories:
......@@ -134,6 +140,7 @@ stages:
verify:
display_name: "Verify"
marketing: true
image: "/images/solutions/solutions-verify.png"
description: "Keep strict quality standards for production code with automatic testing and reporting."
body: |
......@@ -143,7 +150,7 @@ stages:
established: 2012
related:
- "create"
dept: ops
dept: vpr
pm: "Brendan O'Leary"
pmm: William Chia
cm: Aricka Flowers
......@@ -171,6 +178,7 @@ stages:
package:
display_name: "Package"
marketing: true
image: "/images/solutions/solutions-package.png"
description: "Deploy quickly at massive scale with integrated Docker Container Registry"
body: |
......@@ -180,7 +188,7 @@ stages:
vision: /direction/package
roadmap: "https://gitlab.com/groups/gitlab-org/-/roadmap?label_name%5B%5D=devops%3Apackage&scope=all&sort=end_date_asc&state=opened&layout=QUARTERS"
established: 2016
dept: ops
dept: vpr
pm: Joshua Lambert (interim)
pmm: William Chia
cm: Aricka Flowers
......@@ -204,6 +212,7 @@ stages:
secure:
display_name: "Secure"
marketing: true
image: "/images/solutions/solutions-secure.png"
description: "Security capabilities, integrated into your development lifecycle."
body: |
......@@ -214,7 +223,7 @@ stages:
related:
- "create"
- "defend"
dept: sec
dept: secure
pm: Fabio Busatto
pmm: Cindy Blake
cm: Erica Lindberg
......@@ -252,6 +261,7 @@ stages:
release:
display_name: "Release"
marketing: true
image: "/images/solutions/solutions-release.png"
description: "GitLab's integrated CD solution allows you to ship code with zero-touch, be it on one or one thousand servers."
body: |
......@@ -261,7 +271,7 @@ stages:
established: 2016
related:
- "configure"
dept: ops
dept: vpr
pm: Jason Lenny
pmm: William Chia
cm: Aricka Flowers
......@@ -290,6 +300,7 @@ stages:
configure:
display_name: "Configure"
marketing: true
image: "/images/solutions/solutions-configure.png"
description: "Configure your applications and infrastructure."
body: "GitLab helps teams to configure and manage their application environments. Strong integrations to Kubernetes simplifies the effort to define and configure the infrastructure needed to support your application. Protect access to key infrastructure configuration details such as passwords and login information by using ‘secret variables’ to limit access to only authorized users and processes."
......@@ -298,7 +309,7 @@ stages:
established: 2018
related:
- "configure"
dept: ops
dept: cm
pm: Daniel Gruesso
pmm: William Chia
cm: Aricka Flowers
......@@ -331,6 +342,7 @@ stages:
monitor:
display_name: "Monitor"
marketing: true
image: "/images/solutions/solutions-monitor.png"
description: "Automatically monitor metrics so you know how any change in code
impacts your production environment."
......@@ -346,7 +358,7 @@ stages:
established: 2016
related:
- "release"
dept: ops
dept: cm
pm: Joshua Lambert
pmm: William Chia
cm: Aricka Flowers
......@@ -362,14 +374,11 @@ stages:
categories:
- metrics
- tracing
debugging:
name: Debugging
categories:
- logging
- error_tracking
other:
name: Other
debugging_health:
name: "Debugging and Health"
categories:
- error_tracking
- cluster_monitoring
- synthetic_monitoring
- incident_management
......@@ -377,6 +386,7 @@ stages:
defend:
display_name: "Defend"
marketing: true
description: "Defend your apps and infrastructure from security intrusions."
body: |
GitLab provides Network Security and SIEM to help you react to security incidents.
......@@ -387,7 +397,7 @@ stages:
- "release"
- "secure"
- "manage"
dept: sec
dept: defend
pm: Fabio Busatto
pmm: Cindy Blake
cm: Erica Lindberg
......@@ -422,6 +432,41 @@ stages:
categories:
- data_loss_prevention
growth:
display_name: Growth
dept: growth
related:
- manage
- create
- verify
- package
- configure
- monitor
- secure
- defend
established: 2019
groups:
acquisition:
name: "Acquisition and Activation"
pm: Tamas Szuromi
engineering_manager: Liam McAndrew
frontend_engineering_manager: Dennis Tang (Interim)
smau:
name: "Stage Cross Use (SMAU)"
pm: Tamas Szuromi
engineering_manager: Liam McAndrew
frontend_engineering_manager: Dennis Tang (Interim)
converstion:
name: "Conversion and Upsell"
pm: Tamas Szuromi
engineering_manager: Liam McAndrew
frontend_engineering_manager: Dennis Tang (Interim)
retention:
name: "Retention and Reactivation"
pm: Tamas Szuromi
engineering_manager: Liam McAndrew
frontend_engineering_manager: Dennis Tang (Interim)
enablement:
display_name: Enablement
dept: enablement
......
This diff is collapsed.
......@@ -65,10 +65,10 @@ To create a new stage:
There are two categories of stages: 1) "Phases of the software development
lifecycle" and 2) "Quality attributes of GitLab". The features index page
only lists the "Phases of the software development lifecycle". They are
taken from [`data/stages.yml`](/data/stages.yml), and the `enablement`
department is ignored so if that changes, make sure to also update the code
in `source/features/index.html.haml`
(`data.stages.stages.select{|stageKey,stage| stage.dept!="enablement"}.each`).
taken from [`data/stages.yml`](/data/stages.yml), and any stage with
`marketing` set to false is ignored so if that changes, make sure to also
update the code in `source/features/index.html.haml`
(`data.stages.stages.select{|stageKey,stage| stage.marketing}.each`).
1. Create `source/stages/<stage-name>/index.html.haml`. You can copy the