diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-12 13:49:58 +0100 |
| commit | 83ad5de637b884d97b3350a468b9a66c71507dca (patch) | |
| tree | 6344200848b6da6b24a1fdbdb3cc2c4745ee6366 /PROCESS.md | |
| parent | 7f5703484b957718d4f9f576cf8ac22acc45c8de (diff) | |
| parent | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (diff) | |
| download | gitlab-ce-fl-eslint-vue-house-keeping.tar.gz | |
Merge branch 'master' into fl-eslint-vue-house-keepingfl-eslint-vue-house-keeping
* master: (47 commits)
Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapter
i18n: document how to use links without splitting sentences
Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wiki/user_views_wiki_page_spec.rb"
Add CI job to check Gemfile.rails5.lock
Add navigation theme documentation
Move Gitaly branch/tag/ref RPC's to opt-out
Add CI_{PIPELINE,JOB}_URL
Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project""
fixed/enhanced command-line documentation
Use nip.io instead of xip.io
[Rails5] Update Gitlab.rails5.lock
Fix typo in doc/development/README.md
Update import screenshot without LFS warning
Hide overflow on hr
Resolve "Milestone and labels dropdowns are misplaced with collapsed sidebar"
Fix collapse sidebar button color
Remove .row and .col-sm-12
Relax expectation in spec/models/project_spec.rb
fix padding in commit info
GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong
...
Diffstat (limited to 'PROCESS.md')
| -rw-r--r-- | PROCESS.md | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md index 7438df8014b..958bc7b9edc 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -185,11 +185,7 @@ next patch release. If a merge request is to be picked into more than one release it will need one `Pick into X.Y` label per release where the merge request should be back-ported -to. - -For example, if the current patch release is `10.1.1` and a regression fix needs -to be backported down to the `9.5` release, you will need to assign it the -`10.1` milestone and the following labels: +to. For example: - `Pick into 10.1` - `Pick into 10.0` |