Commit 86cc1b2f authored by Amy Qualls's avatar Amy Qualls

Remove outdated word from documentation

The word 'WIP' is deprecated for use in merge request titles. Some
instances in the documentation can be cleaned out relatively easily,
so I'm combining them here.

The harder, bigger changes - such as to
user/project/merge_requests/work_in_progress_merge_requests.md

should be done separately, in the spirit of MVC.
parent 33e02c42
...@@ -43,14 +43,14 @@ guides you through the process. ...@@ -43,14 +43,14 @@ guides you through the process.
| CocoaPods | [#36890](https://gitlab.com/gitlab-org/gitlab/-/issues/36890) | | CocoaPods | [#36890](https://gitlab.com/gitlab-org/gitlab/-/issues/36890) |
| Conda | [#36891](https://gitlab.com/gitlab-org/gitlab/-/issues/36891) | | Conda | [#36891](https://gitlab.com/gitlab-org/gitlab/-/issues/36891) |
| CRAN | [#36892](https://gitlab.com/gitlab-org/gitlab/-/issues/36892) | | CRAN | [#36892](https://gitlab.com/gitlab-org/gitlab/-/issues/36892) |
| Debian | [WIP: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44746) | | Debian | [Draft: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50438) |
| Opkg | [#36894](https://gitlab.com/gitlab-org/gitlab/-/issues/36894) | | Opkg | [#36894](https://gitlab.com/gitlab-org/gitlab/-/issues/36894) |
| P2 | [#36895](https://gitlab.com/gitlab-org/gitlab/-/issues/36895) | | P2 | [#36895](https://gitlab.com/gitlab-org/gitlab/-/issues/36895) |
| Puppet | [#36897](https://gitlab.com/gitlab-org/gitlab/-/issues/36897) | | Puppet | [#36897](https://gitlab.com/gitlab-org/gitlab/-/issues/36897) |
| RPM | [#5932](https://gitlab.com/gitlab-org/gitlab/-/issues/5932) | | RPM | [#5932](https://gitlab.com/gitlab-org/gitlab/-/issues/5932) |
| RubyGems | [#803](https://gitlab.com/gitlab-org/gitlab/-/issues/803) | | RubyGems | [#803](https://gitlab.com/gitlab-org/gitlab/-/issues/803) |
| SBT | [#36898](https://gitlab.com/gitlab-org/gitlab/-/issues/36898) | | SBT | [#36898](https://gitlab.com/gitlab-org/gitlab/-/issues/36898) |
| Terraform | [WIP: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18834) | | Terraform | [Draft: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18834) |
| Vagrant | [#36899](https://gitlab.com/gitlab-org/gitlab/-/issues/36899) | | Vagrant | [#36899](https://gitlab.com/gitlab-org/gitlab/-/issues/36899) |
<!-- vale gitlab.Spelling = YES --> <!-- vale gitlab.Spelling = YES -->
......
...@@ -267,14 +267,14 @@ Some example `if` clauses for `workflow: rules`: ...@@ -267,14 +267,14 @@ Some example `if` clauses for `workflow: rules`:
See the [common `if` clauses for `rules`](#common-if-clauses-for-rules) for more examples. See the [common `if` clauses for `rules`](#common-if-clauses-for-rules) for more examples.
For example, in the following configuration, pipelines run for all `push` events (changes to For example, in the following configuration, pipelines run for all `push` events (changes to
branches and new tags). Pipelines for push events with `-wip` in the commit message branches and new tags). Pipelines for push events with `-draft` in the commit message
don't run, because they are set to `when: never`. Pipelines for schedules or merge requests don't run, because they are set to `when: never`. Pipelines for schedules or merge requests
don't run either, because no rules evaluate to true for them: don't run either, because no rules evaluate to true for them:
```yaml ```yaml
workflow: workflow:
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /-wip$/ - if: $CI_COMMIT_MESSAGE =~ /-draft$/
when: never when: never
- if: '$CI_PIPELINE_SOURCE == "push"' - if: '$CI_PIPELINE_SOURCE == "push"'
``` ```
......
...@@ -12,13 +12,13 @@ either using ActiveRecord/Arel or raw SQL queries. ...@@ -12,13 +12,13 @@ either using ActiveRecord/Arel or raw SQL queries.
## Using LIKE Statements ## Using LIKE Statements
The most common way to search for data is using the `LIKE` statement. For The most common way to search for data is using the `LIKE` statement. For
example, to get all issues with a title starting with "WIP:" you'd write the example, to get all issues with a title starting with "Draft:" you'd write the
following query: following query:
```sql ```sql
SELECT * SELECT *
FROM issues FROM issues
WHERE title LIKE 'WIP:%'; WHERE title LIKE 'Draft:%';
``` ```
On PostgreSQL the `LIKE` statement is case-sensitive. To perform a case-insensitive On PostgreSQL the `LIKE` statement is case-sensitive. To perform a case-insensitive
...@@ -28,13 +28,13 @@ To handle this automatically you should use `LIKE` queries using Arel instead ...@@ -28,13 +28,13 @@ To handle this automatically you should use `LIKE` queries using Arel instead
of raw SQL fragments, as Arel automatically uses `ILIKE` on PostgreSQL. of raw SQL fragments, as Arel automatically uses `ILIKE` on PostgreSQL.
```ruby ```ruby
Issue.where('title LIKE ?', 'WIP:%') Issue.where('title LIKE ?', 'Draft:%')
``` ```
You'd write this instead: You'd write this instead:
```ruby ```ruby
Issue.where(Issue.arel_table[:title].matches('WIP:%')) Issue.where(Issue.arel_table[:title].matches('Draft:%'))
``` ```
Here `matches` generates the correct `LIKE` / `ILIKE` statement depending on the Here `matches` generates the correct `LIKE` / `ILIKE` statement depending on the
...@@ -45,7 +45,7 @@ If you need to chain multiple `OR` conditions you can also do this using Arel: ...@@ -45,7 +45,7 @@ If you need to chain multiple `OR` conditions you can also do this using Arel:
```ruby ```ruby
table = Issue.arel_table table = Issue.arel_table
Issue.where(table[:title].matches('WIP:%').or(table[:foo].matches('WIP:%'))) Issue.where(table[:title].matches('Draft:%').or(table[:foo].matches('Draft:%')))
``` ```
On PostgreSQL, this produces: On PostgreSQL, this produces:
...@@ -53,7 +53,7 @@ On PostgreSQL, this produces: ...@@ -53,7 +53,7 @@ On PostgreSQL, this produces:
```sql ```sql
SELECT * SELECT *
FROM issues FROM issues
WHERE (title ILIKE 'WIP:%' OR foo ILIKE 'WIP:%') WHERE (title ILIKE 'Draft:%' OR foo ILIKE 'Draft:%')
``` ```
## LIKE & Indexes ## LIKE & Indexes
...@@ -64,7 +64,7 @@ the start. For example, this will not use any indexes: ...@@ -64,7 +64,7 @@ the start. For example, this will not use any indexes:
```sql ```sql
SELECT * SELECT *
FROM issues FROM issues
WHERE title ILIKE '%WIP:%'; WHERE title ILIKE '%Draft:%';
``` ```
Because the value for `ILIKE` starts with a wildcard the database is not able to Because the value for `ILIKE` starts with a wildcard the database is not able to
......
...@@ -55,7 +55,7 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres ...@@ -55,7 +55,7 @@ The GitLab University curriculum is composed of GitLab videos, screencasts, pres
1. [Creating a Project in GitLab - Video](https://www.youtube.com/watch?v=7p0hrpNaJ14) 1. [Creating a Project in GitLab - Video](https://www.youtube.com/watch?v=7p0hrpNaJ14)
1. [How to Create Files and Directories](https://about.gitlab.com/blog/2016/02/10/feature-highlight-create-files-and-directories-from-files-page/) 1. [How to Create Files and Directories](https://about.gitlab.com/blog/2016/02/10/feature-highlight-create-files-and-directories-from-files-page/)
1. [GitLab To-Do List](https://about.gitlab.com/blog/2016/03/02/gitlab-todos-feature-highlight/) 1. [GitLab To-Do List](https://about.gitlab.com/blog/2016/03/02/gitlab-todos-feature-highlight/)
1. [GitLab Work in Progress (WIP) Flag](https://about.gitlab.com/blog/2016/01/08/feature-highlight-wip/) 1. [GitLab Draft Flag](https://about.gitlab.com/blog/2016/01/08/feature-highlight-wip/)
### 1.5. Migrating from other Source Control ### 1.5. Migrating from other Source Control
......
...@@ -43,14 +43,14 @@ guides you through the process. ...@@ -43,14 +43,14 @@ guides you through the process.
| CocoaPods | [#36890](https://gitlab.com/gitlab-org/gitlab/-/issues/36890) | | CocoaPods | [#36890](https://gitlab.com/gitlab-org/gitlab/-/issues/36890) |
| Conda | [#36891](https://gitlab.com/gitlab-org/gitlab/-/issues/36891) | | Conda | [#36891](https://gitlab.com/gitlab-org/gitlab/-/issues/36891) |
| CRAN | [#36892](https://gitlab.com/gitlab-org/gitlab/-/issues/36892) | | CRAN | [#36892](https://gitlab.com/gitlab-org/gitlab/-/issues/36892) |
| Debian | [WIP: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44746) | | Debian | [Draft: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/50438) |
| Opkg | [#36894](https://gitlab.com/gitlab-org/gitlab/-/issues/36894) | | Opkg | [#36894](https://gitlab.com/gitlab-org/gitlab/-/issues/36894) |
| P2 | [#36895](https://gitlab.com/gitlab-org/gitlab/-/issues/36895) | | P2 | [#36895](https://gitlab.com/gitlab-org/gitlab/-/issues/36895) |
| Puppet | [#36897](https://gitlab.com/gitlab-org/gitlab/-/issues/36897) | | Puppet | [#36897](https://gitlab.com/gitlab-org/gitlab/-/issues/36897) |
| RPM | [#5932](https://gitlab.com/gitlab-org/gitlab/-/issues/5932) | | RPM | [#5932](https://gitlab.com/gitlab-org/gitlab/-/issues/5932) |
| RubyGems | [#803](https://gitlab.com/gitlab-org/gitlab/-/issues/803) | | RubyGems | [#803](https://gitlab.com/gitlab-org/gitlab/-/issues/803) |
| SBT | [#36898](https://gitlab.com/gitlab-org/gitlab/-/issues/36898) | | SBT | [#36898](https://gitlab.com/gitlab-org/gitlab/-/issues/36898) |
| Terraform | [WIP: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18834) | | Terraform | [Draft: Merge Request](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/18834) |
| Vagrant | [#36899](https://gitlab.com/gitlab-org/gitlab/-/issues/36899) | | Vagrant | [#36899](https://gitlab.com/gitlab-org/gitlab/-/issues/36899) |
<!-- vale gitlab.Spelling = YES --> <!-- vale gitlab.Spelling = YES -->
......
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