Commit 9e4feb7c authored by Matt Vanderpol's avatar Matt Vanderpol

Merge branch 'master' into 1062-blog-category-updates

# Conflicts:
#	source/handbook/marketing/blog/index.html.md
#	source/posts/2016-10-24-how-we-ship-so-quickly.html.md
#	source/posts/2016-11-02-three-things-I-learned-in-my-first-month-at-gitlab.html.md
#	source/posts/2016-11-14-idea-to-production.html.md
#	source/posts/2016-11-22-cognitive-logic-talks-migrating-to-gitlab.html.md
#	source/posts/2016-12-08-gitlab-8-14-webcast.html.md
#	source/posts/2017-03-13-functional-group-updates.html.md
#	source/posts/2017-03-24-functional-group-updates.html.md
#	source/posts/2017-04-03-functional-group-updates.html.md
#	source/posts/2017-05-09-demo-service-desk.html.md
#	source/posts/2017-05-11-functional-group-updates.html.md
#	source/posts/2017-08-18-pick-your-brain-interview-jake-stein.html.md
#	source/posts/2017-10-16-how-to-spot-development-issues.html.md
#	source/posts/2017-10-17-watch-the-gitlab-summit-from-your-desk.html.md
#	source/posts/2017-11-01-gitlab-switches-to-dco-license.html.md
#	source/posts/2017-11-02-automating-boring-git-operations-gitlab-ci.html.md
#	source/posts/2017-12-18-balanced-piaa.html.md
parents e1773357 0c934d5d

Too many changes to show.

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

---
version: "2"
plugins:
csslint:
enabled: true
coffeelint:
enabled: true
duplication:
enabled: true
config:
languages:
- ruby
- javascript
- python
- php
eslint:
enabled: true
fixme:
enabled: true
rubocop:
enabled: true
exclude_patterns:
- node_modules/
- spec/
- source/javascripts/libs/
......@@ -18,7 +18,9 @@ cache:
stages:
- prepare
- build
- test
- deploy
- dast
lint:
stage: build
......@@ -63,6 +65,19 @@ rspec:
tags:
- gitlab-org
enforce_relative_links:
stage: build
image: alpine
cache: {}
before_script:
- apk add --update the_silver_searcher
script:
- set +o errexit
- ag --filename --numbers --break --nogroup --depth -1 --stats --path-to-ignore ./.relative_links_ignore "https?://about.gitlab.com" ./source && rc="$?" || rc="$?"
- if [ "$rc" -eq 0 ]; then exit 1; else exit 0; fi
tags:
- gitlab-org
check_links:
before_script: []
image: coala/base
......@@ -109,6 +124,77 @@ build_master:
only:
- master
codequality:
stage: test
image: docker:stable
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services:
- docker:stable-dind
variables:
DOCKER_DRIVER: overlay2
script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run
--env SOURCE_CODE="$PWD"
--volume "$PWD":/code
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
artifacts:
paths:
- codeclimate.json
dependency_scanning:
stage: test
image: docker:stable
allow_failure: true
before_script: []
cache: {}
dependencies: []
tags: []
services:
- docker:stable-dind
variables:
DOCKER_DRIVER: overlay2
script:
- export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
- docker run
--env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
--volume "$PWD:/code"
--volume /var/run/docker.sock:/var/run/docker.sock
"registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
artifacts:
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
......
......@@ -18,6 +18,11 @@ _Handbook references:_
- Release post handbook: https://about.gitlab.com/handbook/marketing/blog/release-posts/
- Markdown guide: https://about.gitlab.com/handbook/product/technical-writing/markdown-guide/
_People:_
- Release Post Managers: https://about.gitlab.com/handbook/marketing/blog/release-posts/managers/
- Release Managers: https://about.gitlab.com/release-managers/
### General Contributions
**Due date: YYYY-MM-DD** (6th working day before the 22nd)
......@@ -65,7 +70,7 @@ owning the related area:
- [ ] Add GitLab Runner improvements: Fabio
- [ ] Add Omnibus improvements: Joshua
- [ ] Add Mattermost (every other release): Victor
- [ ] Add Mattermost update to the Omnibus improvements section: Victor
- [ ] Add Performance improvements: Douwe, Sean, Kamil, Tim
#### Feature blocks
......@@ -111,7 +116,7 @@ Performed by the PM leading the post:
- [ ] Label MR: ~"blog post" ~release ~review-in-progress
- [ ] Check all comments in the thread (make sure no contribution was left behind)
- [ ] Check Features' names
- [ ] Check Features' availability (CE, EES, EEP, EEU badges)
- [ ] Check Features' availability (Core, Starter, Premium, Ultimate badges)
- [ ] Check Documentation links (all feature blocks contain `documentation_link`)
- [ ] Make sure `documentation_link` links to feature webpages when available
- [ ] Update `data/promo.yml`
......@@ -130,10 +135,10 @@ Performed by technical writers (Axil or Marcia):
- [ ] Label MR: ~"blog post" ~release ~review-structure
- [ ] Check frontmatter (entries, syntax)
- [ ] Check `image_title` and `twitter_image`
- [ ] Check image shadow `{:.shadow}`
- [ ] Check images' `ALT` text
- [ ] Check image shadow applied correctly: `{image_noshadow: true}` when an image already has shadow
- [ ] Videos/iframes wrapped in `<figure>` tags (responsiveness)
- [ ] Add/check `<!-- more -->` separator
- [ ] Wrap text
- [ ] Check headers in sentence case
- [ ] Check feature and product names in capital case
- [ ] Check if images are harmonic/consistent
......@@ -143,6 +148,7 @@ Performed by technical writers (Axil or Marcia):
- [ ] Badges consistency (applied to all headings)
- [ ] Double check documentation updates
- [ ] Check documentation links (point to `/ee/`, not to `/ce/`)
- [ ] Check about.gitlab.com links: relative URLs
- [ ] Remove any remaining instructions
- [ ] Remove HTML comments
- [ ] Run [deadlink checker](https://chrome.google.com/webstore/detail/check-my-links/ojkcdipcgfaekbeaelaapakgnjflfglf)
......
source/atom.xml.haml
......@@ -18,14 +18,14 @@ Options:
DOCSTRING
def strip_html(string)
string.gsub(/<[^>]+>/, '')
string.to_s.gsub(/<[^>]+>/, '')
end
def print_selected(options)
selected = []
team_members = YAML
.load_file('data/team.yml')
.reject { |member| member['picture'].start_with?('logo') }
.reject { |member| member['picture'].include?('logo-extra-whitespace') }
n = options['<n>'].to_i
min = options['--min'].to_i
......
......@@ -113,3 +113,6 @@ ignore '/releases/template.html'
ignore '/team/structure/org-chart/template.html'
ignore '/source/stylesheets/highlight.css'
ignore '/category.html'
# See https://gitlab.com/gitlab-com/infrastructure/issues/4036
proxy '/development/index.html', '/sales/index.html'
......@@ -128,6 +128,15 @@
links:
- url: https://github.com/nmklotas/GitLabCLI
title: Repository on GitHub
<