Thats what I initially said about stuff necessarily being on the same file 
system; Afair our trac plugin creates the merge object in the git store and 
cgit then displays the diff; I think it in

https://github.com/sagemath/sage_trac_plugin/blob/master/sage_trac/git_merger.py




On Wednesday, June 8, 2016 at 3:50:13 PM UTC-4, Erik Bray wrote:
>
> On Wed, Jun 8, 2016 at 7:03 PM, Volker Braun <vbrau...@gmail.com 
> <javascript:>> wrote: 
> > The diff viewer doesn't work; I'm not sure if its supposed to but here 
> we 
> > go: 
> > 
> > 1) go to http://104.197.143.230/ticket/20739 
> > 2) Click on Branch: public/20739 
> > 
> > Results in: 
> > 
> > Bad object name: cbb26b6406d3a1665299fdd3e2f32cf08e7de7ac 
>
> It's likely that the copy of the repository that's on that server, and 
> the Trac database are somewhat out of sync somehow.  If you look at 
> other examples it works fine  (git.sagemath.org is still running on 
> the UW server). 
>
> > On Wednesday, June 8, 2016 at 12:03:47 PM UTC-4, Erik Bray wrote: 
> >> 
> >> On another note, I have a copy of trac.sagemath.org up and running on 
> >> GCE here: http://104.197.143.230/ 
> >> 
> >> In the process of setting it up I also upgraded to the latest Trac 
> >> version (1.1.6).  If anyone has a minute please give it a look and see 
> >> if anything seems amiss (the data itself is a couple days old). 
> >> 
> >> Thanks, 
> >> Erik 
> >> 
> >> On Wed, Jun 8, 2016 at 11:04 AM, Volker Braun <vbrau...@gmail.com> 
> wrote: 
> >> > Of course trac pages are mostly dynamic content, so this would only 
> help 
> >> > with a couple of icons etc. 
> >> > 
> >> > 
> >> > 
> >> > On Wednesday, June 8, 2016 at 8:54:20 AM UTC-4, William wrote: 
> >> >> 
> >> >> Of some relevance -- Harald Schilly was recently in the process of 
> >> >> putting a CloudFlare 'pro subscription' in front of all *.
> sagemath.org 
> >> >> domains, for caching 
> >> >> and anti-DDOS protection, etc.  CloudFlare provides that they 
> >> >> terminate for all sites that they proxy.  However it's obviously 
> good 
> >> >> (but not required) to have a cert for the (secret) connection 
> between 
> >> >> CloudFlare and trac.sagemath.org. 
> >> >> 
> >> >>  - William 
> >> >> 
> >> >> On Wed, Jun 8, 2016 at 6:53 AM, Erik Bray <erik....@gmail.com> 
> wrote: 
> >> >> > On Wed, Jun 8, 2016 at 6:34 AM, mmarco <mma...@unizar.es> wrote: 
> >> >> >> I volunteered some time ago to set up a letsencrypt certificate 
> in 
> >> >> >> the 
> >> >> >> wiki. 
> >> >> >> I didn't include trac server in that move because there was 
> already 
> >> >> >> the 
> >> >> >> option for https, but I agree it would be better to make it https 
> >> >> >> only. 
> >> >> > 
> >> >> > That looks great--I usually have purchased certificates from my 
> DNS 
> >> >> > provider, but I like the looks of this.  When you get a chance 
> could 
> >> >> > you detail how you set that up for the wiki?  In the process of 
> >> >> > transferring over the wiki service we'll want to move the 
> certificate 
> >> >> > over as well, and will want to do the same for the trac site, and 
> any 
> >> >> > others. 
> >> >> > 
> >> >> > -- 
> >> >> > 
> >> >> > --- 
> >> >> > You received this message because you are subscribed to the Google 
> >> >> > Groups "sagemath-admins" group. 
> >> >> > To unsubscribe from this group and stop receiving emails from it, 
> >> >> > send 
> >> >> > an email to sagemath-admi...@googlegroups.com. 
> >> >> > For more options, visit https://groups.google.com/d/optout. 
> >> >> 
> >> >> 
> >> >> 
> >> >> -- 
> >> >> William (http://wstein.org) 
> >> > 
> >> > -- 
> >> > You received this message because you are subscribed to the Google 
> >> > Groups 
> >> > "sage-devel" group. 
> >> > To unsubscribe from this group and stop receiving emails from it, 
> send 
> >> > an 
> >> > email to sage-devel+...@googlegroups.com. 
> >> > To post to this group, send email to sage-...@googlegroups.com. 
> >> > Visit this group at https://groups.google.com/group/sage-devel. 
> >> > For more options, visit https://groups.google.com/d/optout. 
> > 
> > -- 
> > You received this message because you are subscribed to the Google 
> Groups 
> > "sage-devel" group. 
> > To unsubscribe from this group and stop receiving emails from it, send 
> an 
> > email to sage-devel+...@googlegroups.com <javascript:>. 
> > To post to this group, send email to sage-...@googlegroups.com 
> <javascript:>. 
> > Visit this group at https://groups.google.com/group/sage-devel. 
> > For more options, visit https://groups.google.com/d/optout. 
>

-- 
You received this message because you are subscribed to the Google Groups 
"sage-devel" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-devel+unsubscr...@googlegroups.com.
To post to this group, send email to sage-devel@googlegroups.com.
Visit this group at https://groups.google.com/group/sage-devel.
For more options, visit https://groups.google.com/d/optout.

Reply via email to