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.

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

15583 backport #16007

Closed
wants to merge 2 commits into from
Closed

15583 backport #16007

wants to merge 2 commits into from

Conversation

tassoman
Copy link
Contributor

@tassoman tassoman commented Jun 1, 2020

Backporting merge #15583 from 4.x-dev to 3.x-dev.

As superadministrator I would like to compare effective periods (days, weeks, months) instead of data ranges in order to avoid unwanted reports generation

@tsteur
Copy link
Member

tsteur commented Jun 1, 2020

Thanks for the PR @tassoman . Is it possible to undo the composer changes as part of this PR?

@tsteur tsteur added this to the 3.13.6 milestone Jun 1, 2020
@tsteur tsteur added the Needs Review PRs that need a code review label Jun 1, 2020
@tassoman
Copy link
Contributor Author

tassoman commented Jun 1, 2020

Thank you for the review. I'm sorry for being confused at git. That commit is part of another pull request 😒
Maybe happened because I didn't checked out 3.x-dev before committing the code? 🤔

@tsteur
Copy link
Member

tsteur commented Jun 1, 2020

Yes you'd probably want to do something like git checkout -b new_branch_name 3.x-dev so it uses 3.x-dev as a base.

@sgiehl
Copy link
Member

sgiehl commented Jun 2, 2020

You can also try to cherry-pick the original merge commit on a 3.x-dev based branch: git cherry-pick e8cb9c2ae10dceec3fde93acb58569bb8d9c1b59

@tassoman
Copy link
Contributor Author

tassoman commented Jun 3, 2020

Ok. I managed it again, from scratch. Thank you for hinting!

@tassoman tassoman closed this Jun 3, 2020
@tassoman tassoman deleted the 15583_backport branch June 3, 2020 11:13
@tassoman
Copy link
Contributor Author

tassoman commented Jun 3, 2020

#16015 for reference

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants