Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improvement/artesca 9682 #629

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Improvement/artesca 9682 #629

merged 1 commit into from
Oct 20, 2023

Conversation

JeanMarcMilletScality
Copy link
Contributor

Component:

Description:

Design:

Breaking Changes:

  • [] Breaking Changes

Closes: #ISSUE_NUMBER

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

Hello jeanmarcmilletscality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 4, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Oct 5, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Oct 9, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@MonPote MonPote force-pushed the improvement/ARTESCA-9682 branch from 6cb8951 to abbd8d1 Compare October 18, 2023 16:36
@bert-e
Copy link
Contributor

bert-e commented Oct 18, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

Conflict

There is a conflict between your branch improvement/ARTESCA-9682 and the
destination branch development/1.0.

Please resolve the conflict on the feature branch (improvement/ARTESCA-9682).

git fetch && \
git checkout origin/improvement/ARTESCA-9682 && \
git merge origin/development/1.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/ARTESCA-9682

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

upgrade storybook
148fbc2 
fix layout, healthselectorv2

update banner - renamed

update barchart

update button, chips,checkbox,circular and cloud progressbar,constrainedtext

update error pages

update of checkbox chips constrained text and cloud progress bar

update of dropdown dropzone and emptystate

update of icon and create an mdx file to display the docs, update steppers, form, linecharttemporal

add a package to control args

update banner, loader, healthSelector and globalhealthbar

clean repo, deleted unused component and their stories

update stories e-and test on others

updating input story

change input story

update storybook version

update selectinput story

add wrapper at sidebar story

change sparkline, issue with id

start update statuswrapper

change name stack story and spacing.mdx

import toast

formating
hervedombya
hervedombya approved these changes Oct 20, 2023
View reviewed changes
Copy link
Contributor

@hervedombya hervedombya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@JeanMarcMilletScality
Copy link
Contributor Author

/status

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

Status

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@JeanMarcMilletScality
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/1.0

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 20, 2023

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/1.0

Please check the status of the associated issue ARTESCA-9682.

Goodbye jeanmarcmilletscality.

@bert-e bert-e merged commit 148fbc2 into development/1.0 Oct 20, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hervedombya hervedombya hervedombya approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JeanMarcMilletScality @bert-e @hervedombya