Skip to content
Snippets Groups Projects

Fix some CI wording in documentation

Merged Mark Pundsack requested to merge ci-wording into master

What does this MR do?

  • Adds definitions page to CI docs.
  • Adds image of pipelines list (although currently missing border that is on other images).
  • Changes CI to CI/CD in /doc and /doc/ci
  • Sorts user documentation in /doc

Are there points in the code the reviewer needs to double check?

I'm not sure how to generate the border on the screenshot for pipelines. Pipelines is now mentioned in CI documentation, but it's still not mentioned from the doc root, so anyone who is confused by the new Pipelines tab still won't know where to look. I considered calling the link "CI/CD Pipelines", but stopped short.

Why was this MR needed?

Because grammar and confusion.

What are the relevant issue numbers?

Partially fixes #17733 (closed).

Screenshots (if relevant)

[Edit] Pulled grammar tweaks out to separate MR.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
30 30 1. Configure a Runner
31 31
32 From there on, on every push to your Git repository, the build will be
33 automagically started by the Runner and will appear under the project's
34 `/builds` page.
32 From there on, on every push to your Git repository, the Runner will
33 automagically start the pipeline and the pipeline will appear under the
34 project's `/pipelines` page.
35 35
36 36 --
37 37
38 38 This guide assumes that you:
39 39
40 40 have a working GitLab instance of version 8.0 or higher or are using
41 [GitLab.com](https://gitlab.com/users/sign_in)
41 [GitLab.com](https://gitlab.com)
  • I believe this was on purpose. If you are not logged in, https://gitlab.com will redirect you to https://about.gitlab.com.

  • If you are logged in, that URL doesn't work though. You get: image which is pretty horrible. I guess I can see the point though, if you aren't logged in, then this sends you to info about downloading. Still, I'd vote for dropping the sign_in part, unless we fix GitLab itself to not give you that ugly error. Most other sites would just redirect you to the logged in page if you try to log in when you're already logged in. Or display a login page so you can log in as someone else.

  • Ok let's leave it as-is then. This is a bug and I believe there is an issue open.

  • What do you think about making top-level docs for Pipelines, Environments, and Deployments, each starting with some kind of definition?

    That would be cool, yes.

  • I ended up making "Pipelines and Builds" and "Environments and Deployments" because they were related, and the pages looked tiny if I put them by themselves.

  • Mark Pundsack Added 1 commit:

    Added 1 commit:

  • Reassigned to @axil

  • Achilleas Pipinellis Unmarked this merge request as a Work In Progress

    Unmarked this merge request as a Work In Progress

  • Achilleas Pipinellis Status changed to merged

    Status changed to merged

  • mentioned in commit 39c43463

  • Picked into 8-9-stable, will go into 8.9.1.

  • username-removed-128633 Removed ~149423 label

    Removed ~149423 label

  • mentioned in commit bdaced56

  • 1 # Introduction to pipelines and builds
    2
    3 >**Note:**
    4 Introduced in GitLab 8.8.
    5
    6 ## Pipelines
    7
    8 A pipeline is a group of [builds] that get executed in [stages] (batches). All
    • note: [stages] (batches) is bad combination of markdown, it would mean [stages] links to (batches) so the word (batches) will not appear as rendered sentence

      don't know how to "escape" this

    • Please register or sign in to reply
    Please register or sign in to reply
    Loading