Skip to content

Fix edit tag textbox size - #8376

Merged
MorrisJobke merged 1 commit into
masterfrom
devgals
Feb 15, 2018
Merged

Fix edit tag textbox size#8376
MorrisJobke merged 1 commit into
masterfrom
devgals

Conversation

@AasthaGupta

Copy link
Copy Markdown
Member

Fixes#7586

Fixes#7586
Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
@nickvergessennickvergessen added bug design Design, UI, UX, etc. 3. to review Waiting for reviews feature: tags labels Feb 15, 2018
@nickvergessennickvergessen added this to the Nextcloud 14 milestone Feb 15, 2018

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke
MorrisJobke merged commit 8a505e8 into masterFeb 15, 2018
@MorrisJobke
MorrisJobke deleted the devgals branch February 15, 2018 14:50
@MorrisJobke

Copy link
Copy Markdown
Member

@AasthaGupta Could you open a backport PR with the commit cherry picked against stable12 and stable13? Thanks :)

AasthaGupta pushed a commit that referenced this pull request Feb 16, 2018
AasthaGupta pushed a commit that referenced this pull request Feb 16, 2018
@AasthaGupta

AasthaGupta commented Feb 16, 2018

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke I am not sure how to do it. Instructions in much more detail would be a great help :)

@danxuliu

Copy link
Copy Markdown
Member

@AasthaGupta This is how I do them (command line examples; if you use a GUI you will have to translate them to it ;-) ):

  • First I checkout the branch I want to backport; in this case, git checkout devgals
  • Then I create a new branch, which is the one that will be backported; I usually use stableXX-YYY-original-branch-name, where XX is the version and YYY the original pull request (but that is just how I name them; others use different schemes). In this case, git checkout -b stable13-8376-devgals
  • Now I rebase onto the stableXX branch with git rebase --onto stableXX commit-where-my-branch-diverged-from-its-parent-branch stableXX-YYY-original-branch-name; in this case git rebase --onto stable13 HEAD~1 stable13-8376-devgals. HEAD~1 means 1 commit back from the tip of the current branch; the number of commits to go back would be the number of commits in your branch. Instead of HEAD~ZZZ you could also use an explicit commit ID, in this case, cd2e5b5
  • Depending on the changes the commits will be applied cleanly on the stableXX branch, or conflicts may need to be fixed; follow Git instructions in that case ;-)
  • Time to test to ensure that everything works as expected in the stableXX branch
  • Finally, I push the branch to the server and I create a new pull request named [stableXX] Name of the original pull request and with text Backport of #YYY; in this case, [stable13] Fix edit tag textbox size and Backport of Fix edit tag textbox size #8376. And done :-)

@AasthaGupta
AasthaGupta restored the devgals branch February 17, 2018 10:23
@AasthaGupta
AasthaGupta deleted the devgals branch February 17, 2018 10:34
@AasthaGupta

Copy link
Copy Markdown
MemberAuthor

@danxuliu Thanks a lot :)

@danxuliu

Copy link
Copy Markdown
Member

@AasthaGupta You are welcome, and thanks for the fix :-)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugdesignDesign, UI, UX, etc.feature: tags

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@AasthaGupta@MorrisJobke@danxuliu@skjnldsv@nickvergessen