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

[ticket/15580] Remove redundant code from ACP #5155

Closed
wants to merge 1,126 commits into from

Conversation

@3D-I
Copy link
Contributor

commented Mar 8, 2018

PHPBB3-15580

Checklist:

  • Correct branch: master for new features; 3.2.x for fixes
  • Tests pass
  • Code follows coding guidelines: master and 3.2.x
  • Commit follows commit message format

Tracker ticket (set the ticket ID to your ticket ID):

https://tracker.phpbb.com/browse/PHPBB3-15580

rubencm and others added 30 commits Aug 3, 2017
[ticket/15289] Check form
PHPBB3-15289
[ticket/15354] Use Lang Var
PHPBB3-15354
Merge pull request #4939 from CHItA/ticket/15351
[ticket/15351] Fix missing global usage

* github.com:phpbb/phpbb:
  [ticket/15351] Fix missing global usage
marc1706 and others added 18 commits Feb 19, 2018
@3D-I

This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2018

I will wait for instructions.

@3D-I

This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2018

I think I got it. 📝

@3D-I

This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2018

Commit Message amended but still no love. Hints?

@DavidIQ

This comment has been minimized.

Copy link
Member

commented Mar 8, 2018

You have to do an interactive rebase not an amend. Something like git rebase -i HEAD~2 and then go through those 3 commits to keep and squash.

@3D-I

This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2018

Oky, makes sense.

@3D-I 3D-I closed this Mar 8, 2018

@3D-I 3D-I deleted the 3D-I:ticket/15580_3Di branch Mar 8, 2018

@3D-I

This comment has been minimized.

Copy link
Contributor Author

commented Mar 8, 2018

This one triggered the tracker: #5156

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
You can’t perform that action at this time.