Skip to content
This repository was archived by the owner on Dec 2, 2017. It is now read-only.

Add troubleshooting tip. #109

Merged
merged 7 commits into from
Apr 7, 2017
Merged

Add troubleshooting tip. #109

merged 7 commits into from
Apr 7, 2017

Conversation

sbrl
Copy link
Contributor

@sbrl sbrl commented Apr 1, 2017

Added troubleshooting tip, as per the gitter conversation.

Copy link
Member

@strk strk left a comment

Choose a reason for hiding this comment

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

See comments

@@ -23,7 +23,7 @@ There are some steps to do so below. On Unix run as your Gogs user:
* Download the file matching your platform from the [downloads page](https://dl.gitea.io/gitea)
* Put the binary at the desired install location
* Copy `gogs/custom/conf/app.ini` to `gitea/custom/conf/app.ini`
* If you have custom `templates, public` in `gogs/custom/` copy them to `gitea/custom/`.
* If you have custom `templates, public` in `gogs/custom/` copy them to `gitea/custom/`
Copy link
Member

Choose a reason for hiding this comment

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

Maybe the indication could go here directly, like adding: "(or do this in a second step and incrementally because your custom templates might not be compatible with new code anymore)"

@@ -61,6 +61,9 @@ ROOT_PATH = /home/:USER/gitea/log
```

* Verify by starting Gitea with `gitea web`

### Troubleshooting
- If you encounter errors relating to custom templates in the `gitea//custom/templates` folder, try deleting `gitea/custom/templates`.
Copy link
Member

Choose a reason for hiding this comment

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

Deleting seems a bit excessive, maybe "move away" ?

@strk
Copy link
Member

strk commented Apr 1, 2017

Beside the comments, which are suggestions to improve the change, it still LGTM to add a troubleshooting section :)

@sbrl
Copy link
Contributor Author

sbrl commented Apr 1, 2017

@strk Updated.

@strk
Copy link
Member

strk commented Apr 1, 2017

Still fine with me, although I liked the "troubleshooting" section (given you won't know upfront if your templates are compatible, but might instead get a panic crash on first use...)

@sbrl
Copy link
Contributor Author

sbrl commented Apr 1, 2017

Troubleshooting section reinstated

@strk
Copy link
Member

strk commented Apr 1, 2017

Great! Now we need another maintainer to review and a merger to merge ... (slooooow burocracy)



Copy link
Member

Choose a reason for hiding this comment

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

remove an unnecessary empty line.

### Troubleshooting
* If you encounter errors relating to custom templates in the `gitea//custom/templates` folder, try moving the templates causing the errors away one by one. They may not be compatible with Gitea.


Copy link
Member

Choose a reason for hiding this comment

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

remove an unnecessary empty line.



### Troubleshooting
* If you encounter errors relating to custom templates in the `gitea//custom/templates` folder, try moving the templates causing the errors away one by one. They may not be compatible with Gitea.
Copy link
Member

Choose a reason for hiding this comment

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

Missing new line before this

Copy link
Member

Choose a reason for hiding this comment

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

Double slash?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed the double forward slash, but I don't understand "Missing new line before this"

Copy link
Member

Choose a reason for hiding this comment

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

A new line between content and headline

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@tboerger fixed

@strk
Copy link
Member

strk commented Apr 5, 2017

@sbrl please resolve the conflict

@sbrl
Copy link
Contributor Author

sbrl commented Apr 6, 2017

@strk There's a conflict? Where? I feel like I'm missing something here

@appleboy
Copy link
Member

appleboy commented Apr 6, 2017

@sbrl

Conflicting files
content/doc/upgrade/from-gogs.en-us.md

@sbrl
Copy link
Contributor Author

sbrl commented Apr 6, 2017

@appleboy

selection_008

@sbrl
Copy link
Contributor Author

sbrl commented Apr 6, 2017

@appleboy Ah! I see. It right there in the github interface. Sorted! I don't know what it was complaining about :P

@appleboy
Copy link
Member

appleboy commented Apr 7, 2017

LGTM

@appleboy appleboy merged commit b643ab3 into go-gitea:master Apr 7, 2017
@sbrl
Copy link
Contributor Author

sbrl commented Apr 8, 2017

Awesome~! 😄

@sbrl sbrl deleted the patch-1 branch April 17, 2017 11:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants