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

Solution for #6889 #29929

Closed
wants to merge 6 commits into from
Closed

Solution for #6889 #29929

wants to merge 6 commits into from

Conversation

SpamReceiver
Copy link
Contributor

@SpamReceiver SpamReceiver mentioned this pull request Nov 26, 2021
Closed
@szaimen szaimen added the 3. to review Waiting for reviews label Nov 26, 2021
@szaimen szaimen added this to the Nextcloud 24 milestone Nov 26, 2021
@skjnldsv skjnldsv mentioned this pull request Mar 24, 2022
Merged
@blizzz blizzz mentioned this pull request Mar 31, 2022
Merged
@blizzz blizzz mentioned this pull request Apr 7, 2022
Merged
@szaimen
Copy link
Contributor

szaimen commented Apr 7, 2022

@SpamReceiver sorry for coming back to you so late. Can you please rebase this to retrigger the CI? Thank you! :)

@blizzz blizzz mentioned this pull request Apr 13, 2022
Merged
@blizzz blizzz modified the milestones: Nextcloud 24, Nextcloud 25 Apr 21, 2022
PVince81
PVince81 requested changes Jun 10, 2022
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

Nice addition, the bullet points are what I've always missed when referring people to the docs, thanks for adding!

config/config.sample.php Outdated Show resolved Hide resolved
@SpamReceiver SpamReceiver requested a review from PVince81 June 14, 2022 05:51
@SpamReceiver
Copy link
Contributor Author

Help! What do I need to do to complete this ticket?

@PVince81
Copy link
Member

PVince81 commented Jun 30, 2022 •
edited
Loading

@SpamReceiver you need to sign off your commits, see https://github.com/nextcloud/server/pull/29929/checks?check_run_id=6858670749

@SpamReceiver
Copy link
Contributor Author

SpamReceiver commented Jul 3, 2022 •
edited
Loading

@SpamReceiver you need to sign off your commits, see https://github.com/nextcloud/server/pull/29929/checks?check_run_id=6858670749

Thank you very much for this link.

Unfortunately, I have done the edits via the Web GUI and have no local git. Is there a way to fix it?

I discovered "xxx commits behind master" --> "Festch and merge", and now I have another commit, but there was no way to enter a commit message. :-(

@szaimen
Copy link
Contributor

szaimen commented Jul 4, 2022

Hi @SpamReceiver, if you do not want to do it locally, you can otherwise simply create your change from the github web gui on a new branch and open a new PR with that! Do not forget to sign-off your changes directly though!

@SpamReceiver
Copy link
Contributor Author

Hi @SpamReceiver, if you do not want to do it locally, you can otherwise simply create your change from the github web gui on a new branch and open a new PR with that! Do not forget to sign-off your changes directly though!

Okay, I downloaded 2.5G via the clone command and followed the instructions here: https://github.com/nextcloud/server/pull/29929/checks?check_run_id=6858670749

Now, this thing still displays "Merging is blocked".

What am I supposed to do now?

@szaimen
Copy link
Contributor

szaimen commented Jul 14, 2022

What am I supposed to do now?

Try to do your changes again here https://github.com/nextcloud/server/edit/master/config/config.sample.php and create a new PR from that :)

@SpamReceiver
Copy link
Contributor Author

What am I supposed to do now?

Try to do your changes again here https://github.com/nextcloud/server/edit/master/config/config.sample.php and create a new PR from that :)

New pull request: #33470

Please review!

This was referenced Aug 12, 2022
Merged
Merged
@szaimen
Copy link
Contributor

szaimen commented Aug 21, 2022

Superseded by #33470

@szaimen szaimen closed this Aug 21, 2022
@szaimen szaimen removed this from the Nextcloud 25 milestone Aug 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 Awaiting requested review from PVince81

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@SpamReceiver @szaimen @PVince81 @blizzz