Commit 02dc8611 authored by Trevor Knudsen's avatar Trevor Knudsen

Resolve Conflicts

parents 8ce35691 2000a41a
Pipeline #32723930 failed with stages
in 3 minutes and 45 seconds

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

source/javascripts/libs/*.js
source/javascripts/autodevops-animation.js
source/javascripts/mobile-menu.js
source/javascripts/rotate-competitors.js
source/javascripts/testimonials.js
vendor/
public/
node_modules/
*.html.md.erb gitlab-language=markdown
......@@ -13,6 +13,7 @@
/node_modules
/public
/vendor
/tmp
source/stylesheets/screen.css
......@@ -23,3 +24,5 @@ source/stylesheets/screen.css
/.ruby-gemset
.vscode
/tmp
......@@ -19,7 +19,6 @@ cache:
stages:
- prepare
- build
- test
- deploy
- dast
......@@ -50,6 +49,7 @@ crop_pictures:
- data/team.yml
- data/pets.yml
- source/images/team/
- source/alumni/index.html.haml
tags:
- gitlab-org
......@@ -96,6 +96,16 @@ check_links:
tags:
- gitlab-org
generate-handbook-changelog:
before_script: []
stage: build
script:
- bin/generate_handbook_changelog
only:
- schedules
tags:
- gitlab-org
.build_base: &build_base
before_script:
- find source/images/team -type f ! -name '*-crop.jpg' -delete
......@@ -128,7 +138,7 @@ build_master:
- master
codequality:
stage: test
stage: deploy
image: docker:stable
allow_failure: true
before_script: []
......@@ -151,7 +161,7 @@ codequality:
- codeclimate.json
dependency_scanning:
stage: test
stage: deploy
image: docker:stable
allow_failure: true
before_script: []
......@@ -173,31 +183,6 @@ dependency_scanning:
paths:
- gl-dependency-scanning-report.json
dast:
stage: dast
only:
- branches@gitlab-com/www-gitlab-com
except:
- master@gitlab-com/www-gitlab-com
image: registry.gitlab.com/gitlab-org/security-products/zaproxy
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services: []
variables:
DOCKER_DRIVER: overlay2
DAST_WEB_SITE: http://$CI_COMMIT_REF_SLUG.about.gitlab.com
script:
- if [ -z $DAST_WEB_SITE ]; then echo "Please configure DAST_WEB_SITE env variable" && exit 1; fi
- mkdir /zap/wrk/
- /zap/zap-baseline.py -J gl-dast-report.json -t $DAST_WEB_SITE || true
- cp /zap/wrk/gl-dast-report.json .
artifacts:
paths:
- gl-dast-report.json
review:
stage: deploy
allow_failure: true
......@@ -260,3 +245,28 @@ deploy:
- deploy
only:
- master@gitlab-com/www-gitlab-com
dast:
stage: dast
only:
- branches@gitlab-com/www-gitlab-com
except:
- master@gitlab-com/www-gitlab-com
image: registry.gitlab.com/gitlab-org/security-products/zaproxy
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services: []
variables:
DOCKER_DRIVER: overlay2
DAST_WEB_SITE: http://$CI_COMMIT_REF_SLUG.about.gitlab.com
script:
- if [ -z $DAST_WEB_SITE ]; then echo "Please configure DAST_WEB_SITE env variable" && exit 1; fi
- mkdir /zap/wrk/
- /zap/zap-baseline.py -J gl-dast-report.json -t $DAST_WEB_SITE || true
- cp /zap/wrk/gl-dast-report.json .
artifacts:
paths:
- gl-dast-report.json
......@@ -23,6 +23,10 @@ _People:_
- Release Post Managers: https://about.gitlab.com/handbook/marketing/blog/release-posts/managers/
- Release Managers: https://about.gitlab.com/release-managers/
| Release post manager | Tech writer | Copyedit | Messaging Lead | Social |
| --- | --- | --- | --- | --- |
| xx | xx | xx | xx | xx |
### General contributions
**Due date: YYYY-MM-DD** (6th working day before the 22nd)
......@@ -35,13 +39,13 @@ All contributions added by team members, collaborators, and Product Managers (PM
The PM leading the post is responsible for adding and checking the following items:
- [ ] Label MR: ~"blog post" ~release ~P1
- [ ] Label MR: ~"blog post" ~release ~"release post" ~P1
- [ ] Assign the MR to yourself
- [ ] Add milestone
- [ ] Update the links and due dates in this MR description
- [ ] Make sure the blog post initial files, as well as this MR template contain the latest templates
- [ ] Add authorship (author's data)
- [ ] Add Introduction (coordinate with Marketing)
- [ ] Ask the Marketing reviewer to add the introduction
- [ ] Add MVP (feature block)
- [ ] Add MVP to `data/mvps.yml`
- [ ] Add [cover image](https://about.gitlab.com/handbook/marketing/blog/release-posts#cover-image) (`image_title`) (scaled and compressed)
......@@ -52,6 +56,7 @@ page are included in the post
- [ ] Mention the [release managers](https://about.gitlab.com/release-managers/) to remind them
to add the [upgrade barometer](https://about.gitlab.com/handbook/marketing/blog/release-posts#upgrade-barometer) section
- [ ] Mention the team leads to remind them to add the performance improvements: Yorick, Douwe, Sean, Remy, Stan, Kamil, Tim Z., Clement, Andre
- [ ] Ping @atflowers and @aoetama to add the Release Radar webcast link
- [ ] Make sure Upgrade barometer is in
- [ ] Check which one is the top feature (with Job and William)
- [ ] Check if deprecations are included
......@@ -78,7 +83,8 @@ owning the related area:
**Due date: YYYY-MM-DD** (6th working day before the 22nd)
The Product Managers are responsible for adding their feature blocks to the
release post by the due date for general contributions.
release post by the due date for general contributions. PMs are also responsible
for adding any notable Community Contributions.
PMs: please check your box only when **all** your features and deprecations were
added with completion (documentation links, images, etc). Pls don't check if
......@@ -88,6 +94,7 @@ there are still things missing.
- [ ] Daniel (@danielgruesso)
- [ ] Fabio (@bikebilly)
- [ ] James (@jramsay)
- [ ] Jason (@jlenny)
- [ ] Jeremy (@jeremy_)
- [ ] Joshua (@joshlambert)
- [ ] Victor (@victorwu)
......@@ -99,6 +106,7 @@ Tip: make your own checklist:
- Deprecations
- Documentation updated
- Documentation links added to the post
- Community contributions
- Illustrations added to the post (compressed)
- Update `features.yml` (with accompanying screenshots)
......@@ -110,7 +118,7 @@ could be left for fixes and small improvements.
#### Content review
**Due date: YYYY-MM-DD** (2nd working day before the 22nd)
**Due date: YYYY-MM-DD** (5th working day before the 22nd)
Performed by the author of the post:
......@@ -131,9 +139,9 @@ Performed by the author of the post:
#### Structural check
**Due date: YYYY-MM-DD** (2nd working day before the 22nd)
**Due date: YYYY-MM-DD** (3rd working day before the 22nd)
Performed by technical writers (Axil, Marcia, or Mike):
Performed by technical writers (Axil, Evan, Marcia, or Mike):
- 1. Structural check
- [ ] Add the label ~review-structure
...