#2 merging latest upstream master

Open
opened 8 years ago by bill-auger · 8 comments

2016-08-09: @hp - the upgrade is complete on the notabug-new branch of this fork - this is how i would go about the production upgrade:

git remote add bill-auger https://notabug.org/bill-auger/gogs.git
git fetch bill-auger
git co -b notabug-new bill-auger/notabug-new
make
go build --tags "whatever you need"
./gogs web

after this the database schema should be upgraded automatically - it did for me using sqlite

if all is sparkles - commit the auto-magic changes that the re-build made to the "bindata" then reset master like so:

  • 'initial-fork' is at the commit that the first notabug commit was based on from 2015-02-16 - from here it is just a fast-forward merge to the notabug-new branch
git add -A && git commit -m 'rebuild notabug-new'
git checkout master
git reset --hard bill-auger/initial-fork
git merge notabug-new

2016-08-04: zPlus has suggested perhaps it is best to start from a fresh clone and redo the notabug customizations by hand - from what ive found during the merge process this seems reasonable - many of the notabug changes appear to be superseded by upstream at some point - this is a list of what would need to be done on top of a pristine upstream:

  • configure the settings for features originally implemented by notabug but now re-implemented upstream --> [DONE] disabling captchas (proposed upstream #3340) --> [DONE] disabling CDN (serve only files from local instance) --> [DONE] setting default branch to "master"
  • manicure HTML templates --> [DONE] remove references to slack (proposed upstream issue #3356) --> [DONE] hide email addresses per User.HideEmail DB value (proposed upstream issue #3358)
  • restore notabug branding and custom pages --> [DONE] titlebar --> [DONE] logo --> [DONE] favicon --> [DONE] homepage --> [DONE] header --> [DONE] footer --> [DONE] about --> [DONE] help --> [DONE] outages --> [DONE] tos
  • ensure DB schema sanity --> [DONE] re-add HideEmail column to model --> [DONE] rename DB column UserName to Name (supposedly gogs will do this automatically)

progress on this is approach is on the notabug-new branch

2016-08-09: @hp - the upgrade is complete on the notabug-new branch of this fork - this is how i would go about the production upgrade: ``` git remote add bill-auger https://notabug.org/bill-auger/gogs.git git fetch bill-auger git co -b notabug-new bill-auger/notabug-new make go build --tags "whatever you need" ./gogs web ``` after this the database schema should be upgraded automatically - it did for me using sqlite if all is sparkles - commit the auto-magic changes that the re-build made to the "bindata" then reset master like so: * 'initial-fork' is at the commit that the first notabug commit was based on from 2015-02-16 - from here it is just a fast-forward merge to the notabug-new branch ``` git add -A && git commit -m 'rebuild notabug-new' git checkout master git reset --hard bill-auger/initial-fork git merge notabug-new ``` ----- 2016-08-04: zPlus has suggested perhaps it is best to start from a fresh clone and redo the notabug customizations by hand - from what ive found during the merge process this seems reasonable - many of the notabug changes appear to be superseded by upstream at some point - this is a list of what would need to be done on top of a pristine upstream: * configure the settings for features originally implemented by notabug but now re-implemented upstream --> [DONE] disabling captchas ([proposed upstream #3340)](https://github.com/gogits/gogs/issues/3340) --> [DONE] disabling CDN (serve only files from local instance) --> [DONE] setting default branch to "master" * manicure HTML templates --> [DONE] remove references to slack [(proposed upstream issue #3356)](https://github.com/gogits/gogs/issues/3356) --> [DONE] hide email addresses per User.HideEmail DB value [(proposed upstream issue #3358)](https://github.com/gogits/gogs/issues/3358) * restore notabug branding and custom pages --> [DONE] titlebar --> [DONE] logo --> [DONE] favicon --> [DONE] homepage --> [DONE] header --> [DONE] footer --> [DONE] about --> [DONE] help --> [DONE] outages --> [DONE] tos * ensure DB schema sanity --> [DONE] re-add HideEmail column to model --> [DONE] rename DB column UserName to Name (supposedly gogs will do this automatically) progress on this is approach is on the [notabug-new branch](https://notabug.org/bill-auger/gogs/src/notabug-new) <!-- ----- NOTE: below here is for reference only - we are probably not going to do a full merge ----- 2016-07-31: i have started a different approach using a tool i found for large merges ['git-imerge'](https://github.com/mhagger/git-imerge) that may make this merge less error-prone - it breaks the merge into many small steps so that each one is small and easier reason about - the "git-imerge: A Practical Introduction" article on the github README explains it quite well or you can watch a video demo also the current progress of this approach is on the imerge/imerge-upstream branch and i have been documenting in these two files: [IMERGE-CONFLICTS.md](https://notabug.org/bill-auger/gogs/src/imerge/imerge-upstream/IMERGE-CONFLICTS.md) [POSSIBLE-BUGS.md](https://notabug.org/bill-auger/gogs/src/imerge/imerge-upstream/POSSIBLE-BUGS.md) ----- 2016-07-30: the merge-upstream is a the beginning of a straight forward merge - i may have found a better approach tho COMMITS: * [merge upstream/master](https://notabug.org/bill-auger/gogs/commit/21cd1a572aed9f3e9d82465432cf06cb06ad1577) - the first of these commits related to upgrade is plainly the result of the initial merge with upstream including all conflicts - these are documented in detail in the UPGRADE-NOTES directory * [resolve merge conflicts in some templates](https://notabug.org/bill-auger/gogs/commit/0cbe82a55e55b91992b727ae4ff19f5abc64ad6d) - the second commit resolves conflicts for about half of the HTML templates * [stash - resolve dependency issues](https://notabug.org/bill-auger/gogs/commit/356839edfbd044b7b072303f37d063080622e4fb) - the third commit is unfinished - working toward getting the dependencies - some of the the repos have been moved or renamed - this is currently preventing me from building notabug (issues noted in [UPGRADE-NOTES/dependency-issues](https://notabug.org/bill-auger/gogs/raw/merge-upstream/UPGRADE-NOTES/dependency-issues) ) NOTES: * [UPGRADE-NOTES/README-UPGRADE](https://notabug.org/bill-auger/gogs/raw/merge-upstream/UPGRADE-NOTES/README-UPGRADE) file explains the notes in the UPGRADE-NOTES directory * [UPGRADE-NOTES/merge-conflicts](https://notabug.org/bill-auger/gogs/raw/merge-upstream/UPGRADE-NOTES/merge-conflicts) is where i am marking the progress of conflict resolutions one by one -->
bill-auger commented 8 years ago
Owner

the hide email feature is implemented on the upstream-dev branch which ive sent as PR upstream https://github.com/gogits/gogs/pull/3381

will backport to notabug later

the hide email feature is implemented on the upstream-dev branch which ive sent as PR upstream https://github.com/gogits/gogs/pull/3381 will backport to notabug later
zPlus commented 8 years ago

I'll just copy here the comment from TMM, which I think is useful

I think the best way forwards is to just start from scratch, reintroduce hideemail, send that as a PR to upstream, install that version on nab and redo the templates from scratch

I'll just copy here the comment from TMM, which I think is useful > I think the best way forwards is to just start from scratch, reintroduce hideemail, send that as a PR to upstream, install that version on nab and redo the templates from scratch
zPlus commented 8 years ago

In your first point ("configure the settings for features originally implemented by notabug but now re-implemented upstream"), there is also Gravatar

In your first point ("configure the settings for features originally implemented by notabug but now re-implemented upstream"), there is also Gravatar
zPlus commented 8 years ago

About this

 --> re-add HideEmail column to model

why would we need to re-add the hide_email column to the schema?

About this --> re-add HideEmail column to model why would we need to re-add the hide_email column to the schema?
zPlus commented 8 years ago

I believe making a PR for removing Slack will be much simpler than the one for "hide email". If can be as simple as a global setting (in app.ini), and a small change to the corresponding HTML template.

I believe making a PR for removing Slack will be much simpler than the one for "hide email". If can be as simple as a global setting (in app.ini), and a small change to the corresponding HTML template.
bill-auger commented 8 years ago
Owner

regarding HideEmail - the OP here was written before i sent the PR upstream but even if it is accepted it will be some time before that patch makes it into upstream master

regarding gravatar - nothing need to be done because gravatar is now implicitly disabled when external scripts are disabled - there is a separate issue for gravatar

regarding the slack button - yes that would be very simply change but upstream is not interested in that patch

regarding HideEmail - the OP here was written before i sent the PR upstream but even if it is accepted it will be some time before that patch makes it into upstream master regarding gravatar - nothing need to be done because gravatar is now implicitly disabled when external scripts are disabled - there is a separate [issue for gravatar](https://notabug.org/bill-auger/gogs/issues/4) regarding the slack button - yes that would be very simply change but upstream is not interested in that patch
zPlus commented 8 years ago

regarding the slack button - yes that would be very simply change but upstream is not interested in that patch

this is just ridiculous... I'll keep asking them until they add an option to disable Slack. Why wouldn't they accept a patch for this? Is Slack paying for the development of Gogs? What's so special about Slack anyway to give it a free pass?

> regarding the slack button - yes that would be very simply change but upstream is not interested in that patch this is just ridiculous... I'll keep asking them until they add an option to disable Slack. Why wouldn't they accept a patch for this? Is Slack paying for the development of Gogs? What's so special about Slack anyway to give it a free pass?
bill-auger commented 8 years ago
Owner

there is an option already to disable slack but when it is disabled the slack button is still visible even though it does not work - what is proposed now is to remove the useless button and it is thais that they not interested changing - follow the link in the OP above for issue 3356

there is an option already to disable slack but when it is disabled the slack button is still visible even though it does not work - what is proposed now is to remove the useless button and it is thais that they not interested changing - follow the link in the OP above for issue 3356
Sign in to join this conversation.
No Label
No Milestone
No assignee
2 Participants
Loading...
Cancel
Save
There is no content yet.