Skip to content
Snippets Groups Projects

Add auto-cancel for pending pipelines on branch, if they are not HEAD

All threads resolved!

What does this MR do?

Decrease entropy in Gitlab universe :smile_cat:

First iteration for #8998 (closed)

  • Adds option "Auto-cancel pending pipelines" in "CI/CD Pipelines" project settings tab: when checkbox checked, all pending non-HEAD pipelines will be canceled by system, automatizing scenario:

    1. "User creates pipeline for branch" / "User pushes commit to gitlab"
    2. User goes to pipelines index page and cancel unnecessary (only pending) pipelines.
  • Adds target: '_blank' to doc links in "CI/CD Pipelines" project settings tab

  • Refactor spec/services/ci/create_pipeline_service_spec.rb, extracting execute_service method

UI:

  • Pipeline list:
    • Tooltip on canceled status badge
  • MR widget/commit widget:
    • Pipeline #12345678 was auto-canceled.. etc
    • Hovering over the words auto-canceled will bring the same tooltips
  • Pipeline page:
    • Tooltip on canceled status badge
  • Pipeline graph job node:
    • has improved tooltip with auto-canceled (not anything else)
  • Mini pipeline graph stage and job status icons
    • has improved tooltip with auto-canceled (not anything else)
  • Job list
    • Tooltip on canceled status badge
  • Job list in pipeline view
    • Tooltip on canceled status badge
  • Job view
    • Tooltip on canceled status badge

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

Why was this MR needed?

Many reasons are discussed here #8998 (closed)

Screenshots (if relevant)

Option in CI/CD Pipelines Project settings tab:

Screen_Shot_2017-03-12_at_22.31.06

Pipeline list:

Screen_Shot_2017-04-04_at_22.26.12

Pipeline page:

Screen_Shot_2017-04-04_at_22.27.48

Job list:

Screen_Shot_2017-04-04_at_22.28.36

Job view:

Screen_Shot_2017-04-04_at_22.29.17

Job list in pipeline view:

Screen_Shot_2017-04-04_at_22.31.33

Setting:

Screen_Shot_2017-04-06_at_01.44.43

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

#8998 (closed)

Merge request reports

Pipeline #7498930 passed

Pipeline passed for 38796f56 on innerwhisper:8998_skip_pending_commits_if_not_head

Test coverage 69.30% (23.34%) from 2 jobs
Approval is optional

Merged by avatar (Feb 22, 2025 1:05am UTC)

Merge details

Pipeline #7500954 failed

Pipeline failed for 15e87cea on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Rémy Coutable added ~19173 ~164274 labels

    added ~19173 ~164274 labels

  • Lin Jen-Shin
  • Maxim Rydkin marked the task Changelog entry added as completed

    marked the task Changelog entry added as completed

  • Maxim Rydkin added 61 commits

    added 61 commits

    • 85a29bb0...91ac1991 - 60 commits from branch gitlab-org:master
    • 7ded70b8 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • @innerwhisper Thank you for jumping into this. I think we also need a test to make sure that it's cancelling older created or pending pipelines. However in case you're not wasting any effort here, I would like to confirm with product people that what exactly we want here. I'll continue the discussion on the issue.

  • mentioned in issue #8998 (closed)

  • This feels like something that should have a project setting; not in .gitlab.yml. As long as it doesn't cancel a running pipeline, it should be pretty safe, but some people will want it disabled. Maybe by 10.0 we can make it default. And skip the branch filter, at least for first iteration.

  • @markpundsack If we're doing this in 10.0, then I think we could build the options together.

  • @godfat I'm saying do it now, but keep defaults such that we don't change pipeline behavior in a negative way for people. We can easily change defaults at major upgrades. Although we can also change them earlier too, if they're generally improvements. In fact, for this particular change, I'd argue that it's better to have it on by default, and only turn it off if you're one of those users that wants every push built no matter how wasteful. But let's do at least one release with it optional before making that decision. We can enable it for gitlab-ce, test it out first-hand, and if it's overwhelmingly positive, then consider switching it on for everyone by default.

    I haven't looked at the implementation, but one thing I'd ask for is that when it is auto-canceled, someone hovering over the pipeline status will see an explanation, or at least some obvious indication that it was auto-canceled rather than manually canceled. I don't think that needs to be a primary status, just something on hover, for example. /cc @dimitrieh

  • @markpundsack So I think the remaining thing we should decide is where this option should go. In .gitlab-ci.yml or a project setting. @grzesiek said he prefers .gitlab-ci.yml at https://gitlab.com/gitlab-org/gitlab-ce/issues/8998#note_23947692, and since I see this as harmless, I am ok with either way.

  • don't think that needs to be a primary status

    @markpundsack @godfat the first thing that pops up in my mind is a tag:

    image

    Edited by Dimitrie Hoekstra
  • @dimitrieh That could work. What about in MR system information box and elsewhere that we reference pipeline status? Do we have space for a tag everywhere?

  • Maxim Rydkin added 253 commits

    added 253 commits

    • 7ded70b8...f106ad51 - 252 commits from branch gitlab-org:master
    • e94bca72 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • @markpundsack ah good point... mmh

    • Pipeline list: add a tag image
    • MR widget/commit widget: it can be pretty easily done by just saying something like Pipeline #12345678 was auto-canceled.. etc
    • Pipeline page: this is different thing.. as we are not yet showing tags (like latest) on the pipeline page it self.. So in the light of this issue perhaps this should be added, similar to the build page, which has support for tags: image
    • Small individual pipeline status icons, like in project-list etc: Show this in the tooltip test: auto-canceled

    I think this should cover all places if i am correct for pipeline statuses.

    cc: @godfat

    Edited by Dimitrie Hoekstra
  • @dimitrieh The pipeline page should have room up above, in the title summary, without needing to add a tags line to the info box. But strangely, the title on pipeline pages doesn't mention the status in words other than the badge. Instead it focuses on when it was triggered.

    image

    But ignoring that for now:

    image

    It is interesting that we don't show the latest tag on the pipeline page anywhere, but also that no one has ever complained about it being missing. I'd guess it's most useful for deciding which pipeline to click on, and just not something that's important to show on the pipeline detail page itself.

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 5141f184 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 102 commits

    added 102 commits

    • 5141f184...509ff2ab - 101 commits from branch gitlab-org:master
    • 5b322ef6 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 01cdbb2f - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Author Contributor

    @godfat I've added spec for pending pipelines. Next iteration I will add configuration in CI/CD section of project settings.

    Edited by Maxim Rydkin
  • I'd guess it's most useful for deciding which pipeline to click on, and just not something that's important to show on the pipeline detail page itself.

    @markpundsack this makes sense to me.

    However by replacing the triggered, part we lose the information on who triggered it. In the same sense.. godfat in the mockup is not the one who auto cancelled it, as noone did, but the system. Of course we could change the text to: Pipeline #!2343562 was auto-canceled, but triggered by @username but for the sake of small viewports i'd like to keep the titlebar as small as possible.

    Also the job page shows tags in the sidebar, meaning that there should be different place to show these tags. It seems to me that titlebar is not ideal for this.

    I think the row in the widget could suffice and it would perhaps be nice to show it there as well as confirmation if this is actually the latest pipeline yes or no after you opened it (although of low priority)

  • @dimitrieh How about just showing the information on hover? :)

  • Maxim Rydkin marked the task Add specs for above feature as completed

    marked the task Add specs for above feature as completed

  • mentioned in issue #28691 (moved)

  • Grzegorz Bizon mentioned in merge request !8121 (closed)

    mentioned in merge request !8121 (closed)

  • Maxim Rydkin added 543 commits

    added 543 commits

    • 01cdbb2f...8a5557ce - 542 commits from branch gitlab-org:master
    • 4363d390 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 26c5b783 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin unmarked as a Work In Progress

    unmarked as a Work In Progress

  • marked the task Documentation created/updated as completed

  • Maxim Rydkin marked the task Added for this feature/bug as completed

    marked the task Added for this feature/bug as completed

  • Author Contributor

    @godfat Well, I think that feature ready for review. I removed WIP from this MR.

  • Maxim Rydkin added 1 commit

    added 1 commit

    • afeb0280 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • assigned to @godfat

  • @innerwhisper I'll review this tomorrow, thanks!

  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • @innerwhisper Thank you for your contribution! It looks good to me in general. I left a couple of comments. Also please merge from master and resolve conflicts. I guess it's from schema version. You could just set it with whatever greater version.

  • @innerwhisper Great work here! Do we plan to have information about the fact that pipeline was "auto canceled" on pipelines lists, in this iteration?

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 552 commits

    added 552 commits

    • ba4cf678...7867b992 - 551 commits from branch gitlab-org:master
    • c275ce79 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • de02b23f - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Author Contributor

    @godfat @grzesiek Thank you for your review! I will trying to resolve all your points in nearest days.

    @grzesiek

    Do we plan to have information about the fact that pipeline was "auto canceled" on pipelines lists, in this iteration?

    I think we can add new boolean flag (or status) to pipeline, defining auto canceled state. And after that we should decide about UI (message on hover or tags or smth else).

  • Maxim Rydkin added 55 commits

    added 55 commits

    • de02b23f...9ed3db91 - 54 commits from branch gitlab-org:master
    • 9774ed73 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • e49a62c8 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • @ayufan this should have milestone %9.1 correct? :)

  • Kamil Trzciński changed milestone to %9.1

    changed milestone to %9.1

  • I propose to add auto-cancel badge as separate MR as part of solving the failure_reason problem, as we can have different failures:

    • auto-canceled,
    • quota-exceeded,
    • stuck-job.

    The auto_cancel will probably be enabled by default with %9.1.

  • Author Contributor

    @ayufan, @dimitrieh in current realization I added auto_canceled_by integer field to pipeline (in which we put pipeline id that triggers auto cancel). So we can have additional info (maybe on hover something like this pipeline was auto canceled by pipeline №2312312)

  • Maxim Rydkin added 189 commits

    added 189 commits

    • e49a62c8...fe4a1865 - 188 commits from branch gitlab-org:master
    • 743a7dd6 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 778f3e98 - replace auto_cancel_pending_pipelines boolean setting with integer (and enum in model)

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • e45a103b - remove projekt attribute and clean up spec

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • ae4dcbe9 - clean up spec withcouple of shared examples

    Compare with previous version

  • Maxim Rydkin added 8 commits

    added 8 commits

    • ae4dcbe9...b7166806 - 7 commits from branch gitlab-org:master
    • 1d552ce1 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 976baf5a - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Author Contributor

    @godfat I tried to reply on all your points in MR. The next step for me, I think, is to add badges as proposed by @ayufan https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362#note_25345261

  • @godfat @ayufan @innerwhisper


    with regards to https://gitlab.com/gitlab-org/gitlab-ce/issues/8998#note_24874844

    Let's change the text in the settings to: Auto-cancel redundant, pending pipelines with subtext New pipelines will cancel older, pending pipelines on the same branch.


    With regards to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362#note_25345261

    if were to add this information of showing that something is auto-cancelled or something else. We basically need a good and consistent way to show this in both the pipeline view, as well as the pipeline list and the individual job views + list.

    The best way to do this is with a tag as was shown here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362#note_24037038

    However we now have 3 causes for auto-cancels:

    • redundant pipeline, newer pipeline exists,
    • quota-exceeded,
    • stuck-job.

    Which will result in tooltips on the badges and auto-cancel wordings:

    • This pipeline is redundant as a newer pipeline exists
    • The pipeline quota has been exceeded
    • This pipeline has had a stuck job for too long

    So this will result in:

    • Pipeline list:
      • add a tag image
      • has tooltip
    • MR widget/commit widget:
      • Pipeline #12345678 was auto-canceled.. etc
      • Hovering over the words auto-canceled will bring the same tooltips
    • Pipeline page:
      • add tag row on widget image
      • has tooltip
    • Pipeline graph job node:
      • has improved tooltip with auto-canceled (not anything else)
    • Mini pipeline graph stage and job status icons
      • has improved tooltip with auto-canceled (not anything else)
    • Job list
      • add a tag image
      • has tooltip
    • job list in pipeline view
      • add a tag image
      • has tooltip
    • job view
      • add a tag image
      • has tooltip
    Edited by Dimitrie Hoekstra
  • assigned to @godfat

  • @dimitrieh I would be careful in adding them in Tags, as this tags are used to choose runner to be used.

  • @innerwhisper @dimitrieh Sorry I would review this tomorrow, running out of time today.

  • mentioned in issue #29495 (closed)

  • @dimitrieh Do we have established concept that for example, gray or black tags are information from the system? I am thinking the concern raise by @ayufan, where maybe we could say that "blue tags" are the tags which determine the runner, while the other colours might have different meaning?

  • @ayufan that is a good point...

    @godfat @ayufan @innerwhisper In that case let's switch to:


    with regards to https://gitlab.com/gitlab-org/gitlab-ce/issues/8998#note_24874844

    Let's change the text in the settings to: Auto-cancel redundant, pending pipelines with subtext New pipelines will cancel older, pending pipelines on the same branch.


    With regards to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362#note_25345261

    if were to add this information of showing that something is auto-cancelled or something else. Also we can't use tags as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9362#note_25404835

    However we now have 3 causes for auto-cancels:

    • redundant pipeline, newer pipeline exists,
    • quota-exceeded,
    • stuck-job.

    Which will result in tooltips on status badges, status icons and auto-cancel wordings:

    • This pipeline is redundant as a newer pipeline exists
    • The pipeline quota has been exceeded
    • This pipeline has had a stuck job for too long

    So this will result in:

    • Pipeline list:
      • Tooltip on canceled status badge
    • MR widget/commit widget:
      • Pipeline #12345678 was auto-canceled.. etc
      • Hovering over the words auto-canceled will bring the same tooltips
    • Pipeline page:
      • Tooltip on canceled status badge
    • Pipeline graph job node:
      • has improved tooltip with auto-canceled (not anything else)
    • Mini pipeline graph stage and job status icons
      • has improved tooltip with auto-canceled (not anything else)
    • Job list
      • Tooltip on canceled status badge
    • Job list in pipeline view
      • Tooltip on canceled status badge
    • Job view
      • Tooltip on canceled status badge

    the alternative solution would be a full status, which ties in with https://gitlab.com/gitlab-org/gitlab-ce/issues/27276

  • @ayufan does that make sense to you?

  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • @innerwhisper Looks good to me! Great job. I thinking we're getting close. One more thing is that the failing test:

    https://gitlab.com/innerwhisper/gitlab-ce/builds/12241996

    You should probably add auto_canceled_by to safe_model_attributes.yml

  • Lin Jen-Shin
  • Lin Jen-Shin added ~724481 label

    added ~724481 label

  • Maxim Rydkin added 215 commits

    added 215 commits

    • 976baf5a...7a623907 - 214 commits from branch gitlab-org:master
    • ff5a7e39 - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 24 commits

    added 24 commits

    • ff5a7e39...0eff4f14 - 23 commits from branch gitlab-org:master
    • 4f95fe8d - add auto-cancel for pending pipelines on branch, if they are not HEAD

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • bc4bafcd - add does not cancel HEAD pipeline spec

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • a94c054e - move auto_cancelable_pipelines method to create_pipeline_service.rb

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • a35d09ab - change order of enum options in auto_cancel_pending_pipelines

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 69ca7e6b - more brief way of get parent commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 365db60d - rename auto_canceled_by and add foreign key

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 4a544551 - add auto_canceled_by_id to safe_model_attributes.yml

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • a42dcabd - fix fallen import_export spec

    Compare with previous version

  • Maxim Rydkin marked the task Tooltip on canceled status badge as completed

    marked the task Tooltip on canceled status badge as completed

  • Maxim Rydkin marked the task Tooltip on canceled status badge as completed

    marked the task Tooltip on canceled status badge as completed

  • Maxim Rydkin marked the task Tooltip on canceled status badge as completed

    marked the task Tooltip on canceled status badge as completed

  • Maxim Rydkin marked the task Tooltip on canceled status badge as completed

    marked the task Tooltip on canceled status badge as completed

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 238bba96 - adds tooltips into several places

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 0b089e86 - add tooltip on badge in pipelines index

    Compare with previous version

  • Maxim Rydkin marked the task Tooltip on canceled status badge as completed

    marked the task Tooltip on canceled status badge as completed

  • Author Contributor

    @godfat Well, I made one more iteration on MR:

    • replied all comments
    • add several tooltips

    But I have several questions. Could you help me with them?

    @godfat @dimitrieh I've added tooltips on several badges (listed in MR's description)

    I've used extended wording on tooltip (with pointer on auto-cancel subject), screenshot placed in MR's description. What do you think?

    Edited by Maxim Rydkin
  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • @innerwhisper looks great!!

    small edit, could you change the tooltip to:

    Pipeline is redundant and is auto-canceled by Pipeline #75

    What about the MR-widget? ^^ and for example the pipeline status icon on the project's page

  • Lin Jen-Shin
  • mentioned in issue #29723 (closed)

  • @innerwhisper Thanks for the extended works! I left a few more comments and asked @ClemMakesApps help us review frontend codes.

  • Maxim Rydkin added 65 commits

    added 65 commits

    • 278f2152...fc2f0eba - 50 commits from branch gitlab-org:master
    • 3843d2ad - add auto-cancel for pending pipelines on branch, if they are not HEAD
    • deb72948 - add does not cancel HEAD pipeline spec
    • d0f7af7a - move auto_cancelable_pipelines method to create_pipeline_service.rb
    • 38bc9f6d - fix typo
    • 1c8ad164 - change order of enum options in auto_cancel_pending_pipelines
    • bc433526 - more brief way of get parent commit
    • 99e1d464 - rename auto_canceled_by and add foreign key
    • 7f5ffa81 - add auto_canceled_by_id to safe_model_attributes.yml
    • 9d4100fe - fix on_delete
    • 749622b1 - fix rubocop
    • f23370f1 - fix fallen import_export spec
    • 33870c24 - adds tooltips into several places
    • 5c08aad1 - add tooltip on badge in pipelines index
    • f6c9aa69 - fix linter error
    • 95139971 - remove a pending pipeline shared example

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • b2d5488a - replace on_delete in migration with database type related expression

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • b2ead4c0 - add presenter for status badge

    Compare with previous version

  • Author Contributor

    @dimitrieh

    small edit, could you change the tooltip to:

    Pipeline is redundant and is auto-canceled by Pipeline #75

    Yep, replaced with your wording.

    What about the MR-widget? ^^ and for example the pipeline status icon on the project's page

    I will try to add it, but I'm just :turtle: in some frontend deals :smiley_cat:

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Lin Jen-Shin
  • Maxim Rydkin added 448 commits

    added 448 commits

    • c12c1c57...bc36dfe8 - 429 commits from branch gitlab-org:master
    • 2537ab39 - add auto-cancel for pending pipelines on branch, if they are not HEAD
    • c1203ebf - add does not cancel HEAD pipeline spec
    • 7166749a - move auto_cancelable_pipelines method to create_pipeline_service.rb
    • 73da7d04 - fix typo
    • eb20b504 - change order of enum options in auto_cancel_pending_pipelines
    • 034c3a4c - more brief way of get parent commit
    • 0d963eba - rename auto_canceled_by and add foreign key
    • d746c92f - add auto_canceled_by_id to safe_model_attributes.yml
    • 182651c1 - fix on_delete
    • f5dd0119 - fix rubocop
    • 4684d7e3 - fix fallen import_export spec
    • 2dbca61d - adds tooltips into several places
    • 7f94a861 - add tooltip on badge in pipelines index
    • 90ee3a12 - fix linter error
    • 2e6cc182 - remove a pending pipeline shared example
    • 75f01674 - refactor spec
    • de0c576a - replace on_delete in migration with database type related expression
    • 4cc5b38b - add presenter for status badge
    • 77e36d35 - fix migration error

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Kamil Trzciński
  • Maxim Rydkin added 79 commits

    added 79 commits

    • 336c9763...15ca592f - 57 commits from branch gitlab-org:master
    • a69d5604 - add auto-cancel for pending pipelines on branch, if they are not HEAD
    • e56597a4 - add does not cancel HEAD pipeline spec
    • ccf37249 - move auto_cancelable_pipelines method to create_pipeline_service.rb
    • cd071819 - fix typo
    • 603124d5 - change order of enum options in auto_cancel_pending_pipelines
    • 5918f091 - more brief way of get parent commit
    • 68f80c93 - rename auto_canceled_by and add foreign key
    • 04d2ed8a - add auto_canceled_by_id to safe_model_attributes.yml
    • 855133ac - fix on_delete
    • 13c6e4bf - fix rubocop
    • eb902d1c - fix fallen import_export spec
    • bf2671e4 - adds tooltips into several places
    • 02f402ab - add tooltip on badge in pipelines index
    • 75d994d7 - fix linter error
    • 31ba3812 - remove a pending pipeline shared example
    • 76ced33c - refactor spec
    • 9b5ff25d - replace on_delete in migration with database type related expression
    • b84c5d52 - add presenter for status badge
    • 6b6d19f2 - fix migration error
    • a84f452c - remove redundant pipeline
    • 2993f323 - remove unnecessary space
    • 3ae3f280 - rename pipeline_presenter

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    Compare with previous version

  • Kamil Trzciński
  • Kamil Trzciński
  • Kamil Trzciński
  • Kamil Trzciński
  • Kamil Trzciński
  • Kamil Trzciński
  • Shinya Maeda mentioned in merge request !10133 (merged)

    mentioned in merge request !10133 (merged)

  • Achilleas Pipinellis added ~1571630 label

    added ~1571630 label

  • mentioned in issue #30446 (closed)

  • Maxim Rydkin added 372 commits

    added 372 commits

    • 756d727a...0a4b853f - 348 commits from branch gitlab-org:master
    • c81ef304 - add auto-cancel for pending pipelines on branch, if they are not HEAD
    • c77b1cb0 - add does not cancel HEAD pipeline spec
    • b1dc850a - move auto_cancelable_pipelines method to create_pipeline_service.rb
    • 9bdb869a - fix typo
    • 67f27a1c - change order of enum options in auto_cancel_pending_pipelines
    • 40f67c1d - more brief way of get parent commit
    • a4d08e6b - rename auto_canceled_by and add foreign key
    • 2eb7ae9e - add auto_canceled_by_id to safe_model_attributes.yml
    • effcbaf3 - fix on_delete
    • b5c28699 - fix rubocop
    • aa4a9b9b - fix fallen import_export spec
    • 2d7bc695 - adds tooltips into several places
    • ebf05201 - add tooltip on badge in pipelines index
    • 29db8ab9 - fix linter error
    • d2f2168b - remove a pending pipeline shared example
    • b49e7966 - refactor spec
    • 4f748f74 - replace on_delete in migration with database type related expression
    • 63dbdb9f - add presenter for status badge
    • a0de26f2 - fix migration error
    • 86d8c2a7 - remove redundant pipeline
    • 3a7352fd - remove unnecessary space
    • 14722b66 - rename pipeline_presenter
    • b9f7d4b4 - split up migrations
    • 25756618 - replace helper with decorator

    Compare with previous version

  • Maxim Rydkin added 1 commit

    added 1 commit

    • 2d4fd769 - replaced one more helper with presenter

    Compare with previous version

  • @innerwhisper Hi, since we want this before 7th, would you mind if you add me as a collaborator for your fork, and I'll commit directly and get this merged soon? Or would you mind if I just take this over and use another branch based on your current works?

  • Author Contributor

    @godfat Hi! Yep, I've sent you invitation to my fork with Master access.

    Edited by Maxim Rydkin
  • Author Contributor

    @godfat Is it enough for you to continue?

  • @innerwhisper Yes, thank you for that. I also saw that your fork is a mirror, which I assume we don't need so I turned off mirroring to save some resource. Let me know if you really need it as a mirror and we could turn it back.

    I'll start working on this. Let me know if you need anything. Thank you!

  • assigned to @godfat

  • Author Contributor

    @godfat I think that I don't need mirroring :smiley: It's sadly, that I hadn't enough time to bring this MR to "mergeable" state. But I agree, that better we will get this feature in 9.1. I hope, in 9.1 :smile:

  • @innerwhisper Really thank you for the contribution, and I think it's almost done (great job!) just that we're extending the scope a few times, and we really want to ship it in 9.1 :P So now I am trying to cut the scope a bit and complete the rest of tests.

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 34eea295 - Fix test and only show job status title if it's

    Compare with previous version

  • mentioned in issue #30510 (closed)

  • mentioned in issue #30511 (closed)

  • Lin Jen-Shin added 3 commits

    added 3 commits

    • 33deaaf3 - Remove tooltip from API and vue, follow up:
    • 016e1a29 - Restore schema
    • 6bf1780a - Add tests for relations and scopes, and setting

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • f7014cd5 - Add a test to make sure it's not auto-canceling

    Compare with previous version

  • @ayufan Please advise on the last unresolved comment, and all other stuffs should be ready for review.

  • assigned to @ayufan

  • assigned to @godfat

  • Lin Jen-Shin added 100 commits

    added 100 commits

    • f7014cd5...aaa49c2c - 97 commits from branch gitlab-org:master
    • ec3a50f1 - Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
    • 4a030326 - Fix rolling back for MySQL
    • 06b4ea24 - Fix a view test by using presenter

    Compare with previous version

  • Lin Jen-Shin added 28 commits

    added 28 commits

    • 06b4ea24...d062af91 - 26 commits from branch gitlab-org:master
    • 98a4aca6 - Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head
    • 057c0d7a - Also track auto-cancelling in jobs, detail:

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 38c324b9 - We don't have to save, transition would save for us

    Compare with previous version

  • @ayufan Please take a look. Now I am a bit unsure if this is the right approach.

  • assigned to @ayufan

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 1bed2c87 - Add missing tests and update test description

    Compare with previous version

  • I have no idea why it's saying that the column auto_canceled_by_id in ci_builds is duplicated? https://gitlab.com/innerwhisper/gitlab-ce/builds/13807270

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Kamil Trzciński resolved all discussions

    resolved all discussions

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Retrying failed jobs, and I also pushed a new commit to fix rubocop offenses. One might be coming from master, but I am fixing that anyway.

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • beedfc8d - Fix test by ignoring auto_canceled_by for jobs

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    Compare with previous version

  • Lin Jen-Shin added 226 commits

    added 226 commits

    • 5a4aee36...bc3b0418 - 225 commits from branch gitlab-org:master
    • e28fc7b1 - Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head

    Compare with previous version

  • Lin Jen-Shin added 71 commits

    added 71 commits

    • e28fc7b1...6ea35f98 - 70 commits from branch gitlab-org:master
    • f8fe64a6 - Merge remote-tracking branch 'upstream/master' into 8998_skip_pending_commits_if_not_head

    Compare with previous version

  • Lin Jen-Shin added 1 commit

    added 1 commit

    • 38796f56 - Fix bad conflict resolution

    Compare with previous version

  • mentioned in commit 15e87cea

  • mentioned in issue #30683 (closed)

  • mentioned in issue #17891 (moved)

  • mentioned in issue #28636 (closed)

  • Lin Jen-Shin mentioned in merge request !12509 (merged)

    mentioned in merge request !12509 (merged)

  • Sean McGivern mentioned in merge request !19820 (merged)

    mentioned in merge request !19820 (merged)

  • Maxim Rydkin mentioned in merge request !28327 (merged)

    mentioned in merge request !28327 (merged)

  • GitLab Community Contributions Toolbox Bot changed the description

    changed the description

  • Please register or sign in to reply
    Loading