Skip to content
Snippets Groups Projects

Add possibility to add new branch rules

Merged Nataliia Radina requested to merge 388128-add-branch-rule into master
2 unresolved threads

What does this MR do and why?

Add possibility to add new branch rules

Add dropdown and modal for branch rule creation

Changelog: changed

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After
Screenshot 2023-12-20 at 11.11.06.png Screenshot 2023-12-20 at 11.05.48.png

How to set up and validate locally

  1. Enable add_branch_rule FF
  2. Go to any project Settings > Repository
  3. Observe branch rule section, and add branch rule button/dropdown

Related to #388128 (closed)

Edited by Nataliia Radina

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
  • Contributor
    2 Warnings
    :warning: This MR changes code in ee/, but its Changelog commit is missing the EE: true trailer. Consider adding it to your Changelog commits.
    :warning:

    featureaddition and featureenhancement merge requests normally have a documentation change. Consider adding a documentation update or confirming the documentation plan with the Technical Writer counterpart.

    For more information, see:

    Reviewer roulette

    Changes that require review have been detected!

    Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:

    Category Reviewer Maintainer
    backend @syarynovskyi profile link current availability (UTC+2, 1 hour ahead of author) @kerrizor profile link current availability (UTC-8, 9 hours behind author)
    frontend @robyrne profile link current availability (UTC+0, 1 hour behind author) @pgascouvaillancourt profile link current availability (UTC-5, 6 hours behind author)
    UX @annabeldunstone profile link current availability (UTC+0, 1 hour behind author) Maintainer review is optional for UX

    Please check reviewer's status!

    • available Reviewer is available!
    • unavailable Reviewer is unavailable!

    Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.

    To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.

    Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.

    If needed, you can retry the :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

  • Contributor

    Bundle size analysis [beta]

    This compares changes in bundle size for entry points between the commits d0b45c61 and a2c81946

    :sparkles: Special assets

    Entrypoint / Name Size before Size after Diff Diff in percent
    average 4.12 MB 4.12 MB - 0.0 %
    mainChunk 3.09 MB 3.09 MB - 0.0 %

    :fearful: Significant Growth: 2

    Expand
    Entrypoint / Name Size before Size after Diff Diff in percent
    pages.projects.settings.repository.create_deploy_token 600.29 KB 632.49 KB +32.21 KB 5.4 %
    pages.projects.settings.repository.show 600.26 KB 632.47 KB +32.21 KB 5.4 %

    Your MR has at least one entrypoint growing significantly (more > 1 KB or 2%). If you write new or extend existing features, this is expected and there is nothing to worry about.

    Please consider pinging someone from the FE Foundations (@leipert, @markrian, @pgascouvaillancourt, @sdejonge or @thutterer) for review, if you are unsure about the size increase.

    Note: We do not have exact data for d0b45c61. So we have used data from: bd689b1c.
    The target commit was too new, so we used the latest commit from master we have info on.
    It might help to rerun the bundle-size-review job
    This might mean that you have a few false positives in this report. If something unrelated to your code changes is reported, you can check this comparison in order to see if they caused this change.

    Please look at the full report for more details


    Read more about how this report works.

    Generated by :no_entry_sign: Danger

  • Contributor

    E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :white_check_mark: test report for a2c81946

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Create      | 54     | 0      | 7       | 0     | 61    | ✅     |
    | Verify      | 31     | 0      | 0       | 0     | 31    | ✅     |
    | Release     | 5      | 0      | 0       | 0     | 5     | ✅     |
    | Data Stores | 21     | 0      | 2       | 0     | 23    | ✅     |
    | Govern      | 67     | 0      | 0       | 0     | 67    | ✅     |
    | Package     | 15     | 0      | 1       | 0     | 16    | ✅     |
    | Plan        | 54     | 0      | 1       | 0     | 55    | ✅     |
    | Analytics   | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Monitor     | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Manage      | 0      | 0      | 1       | 0     | 1     | ➖     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 256    | 0      | 12      | 0     | 268   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+

    e2e-package-and-test: :x: test report for a2c81946

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Create      | 278    | 2      | 28      | 4     | 308   | ❌     |
    | Govern      | 6      | 0      | 0       | 0     | 6     | ✅     |
    | Plan        | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Data Stores | 4      | 0      | 0       | 0     | 4     | ✅     |
    | Package     | 0      | 0      | 2       | 0     | 2     | ➖     |
    | Monitor     | 8      | 0      | 0       | 0     | 8     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 304    | 2      | 30      | 4     | 336   | ❌     |
    +-------------+--------+--------+---------+-------+-------+--------+

    e2e-review-qa: :white_check_mark: test report for a2c81946

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Plan        | 3      | 0      | 1       | 0     | 4     | ✅     |
    | Create      | 8      | 0      | 2       | 2     | 10    | ✅     |
    | Govern      | 3      | 0      | 0       | 0     | 3     | ✅     |
    | Package     | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Data Stores | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Monitor     | 4      | 0      | 0       | 0     | 4     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 20     | 0      | 4       | 2     | 24    | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
  • Dan MH added UX label

    added UX label

  • Nataliia Radina added 1 commit

    added 1 commit

    • a8662203 - Add possibility to add new branch rules

    Compare with previous version

  • Nataliia Radina added 1670 commits

    added 1670 commits

    Compare with previous version

  • Nataliia Radina added 1 commit

    added 1 commit

    • 1d451045 - Add possibility to add new branch rules

    Compare with previous version

  • Nataliia Radina resolved all threads

    resolved all threads

  • Nataliia Radina added 1 commit

    added 1 commit

    • 80360fc5 - Add link to introduced_by_url

    Compare with previous version

  • requested review from @tvellishetty

  • requested review from @andrei.zubov

  • Nataliia Radina changed the description

    changed the description

  • Andrei Zubov
  • Andrei Zubov
  • Tarun Vellishetty approved this merge request

    approved this merge request

  • Tarun Vellishetty requested review from @kerrizor and removed review request for @tvellishetty

    requested review from @kerrizor and removed review request for @tvellishetty

  • Kerri Miller approved this merge request

    approved this merge request

  • Andrei Zubov approved this merge request

    approved this merge request

  • requested review from @pgascouvaillancourt

  • Paul Gascou-Vaillancourt approved this merge request

    approved this merge request

  • Nataliia Radina added 952 commits

    added 952 commits

    Compare with previous version

  • mentioned in issue #437086

  • Mark Florian added 1 commit

    added 1 commit

    Compare with previous version

  • Paul Gascou-Vaillancourt approved this merge request

    approved this merge request

  • Paul Gascou-Vaillancourt resolved all threads

    resolved all threads

  • Paul Gascou-Vaillancourt enabled an automatic merge when the pipeline for b27d561b succeeds

    enabled an automatic merge when the pipeline for b27d561b succeeds

  • mentioned in commit ce9fd52c

  • added workflowstaging label and removed workflowcanary label

  • Please register or sign in to reply
    Loading