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

Testing #52

Closed
wants to merge 26 commits into from
Closed

Testing #52

wants to merge 26 commits into from

Conversation

maniackcrudelis
Copy link
Contributor

Problem

Solution

  • And how you fix that

PR Status

  • Code finished.
  • Tested with Package_check.
  • Fix or enhancement tested.
  • Upgrade from last version tested.
  • Can be reviewed and tested.

Validation


Minor decision

  • Upgrade previous version :
  • Code review :
  • Approval (LGTM) :
  • Approval (LGTM) :
  • CI succeeded :
    Build Status
    When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.

JimboJoe and others added 26 commits August 27, 2017 09:51
… from/to "/path" locations

Rename comment prefixes fore more readability
* Keep optional configuration lines in nginx.conf to allow changing URL from/to "/path" locations
Rename comment prefixes fore more readability
* Add change_url script
* Require YNH 2.7.2, remove helpers and sudo prefixes
* Use ynh_replace_string
* Handle nginx conf file checksums
* Fix indentation
Duplicated from YunoHost-Apps/searx_ynh#35, merged as a micro decision
* Simplify change_url script by using newly accessible conf folder

* Clear assets cache (fixes #48)

* Fix path_url bug and more comments
@lapineige
Copy link
Member

Sounds like I forgot it was the testing branch and not master... 😅 (I'm using the testing branch daily)

@lapineige lapineige requested review from JimboJoe and lapineige June 26, 2018 16:25
@lapineige
Copy link
Member

I will test a fresh install just in case, if everything is fine, it's OK for me (everything was already testing before each commit, and I'm up to date with all those changes).

@maniackcrudelis
Copy link
Contributor Author

But I don't understand why this testing branch has conflicts with master and all those commits !
Anyway, there's only 1 "real" PR on this testing, #50 and this commit 4d7912c.
I think we should destroy the testing branch, recreate a new one, and merge again those modifications.

@lapineige
Copy link
Member

Yes, I suppose it's safer to do it this way.

@maniackcrudelis maniackcrudelis deleted the testing branch June 29, 2018 18:24
@maniackcrudelis maniackcrudelis mentioned this pull request Jun 29, 2018
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants