We didn't come to much of an agreement, but there has been some progress: > # Extracting information from a git repository > # Provide access to Gitlab::Git library > gem 'gitlab_git', '~> 1.3.0' > # Ruby/Rack Git Smart-HTTP Server Handler > gem 'gitlab-grack', '~> 1.0.0', require: 'grack' > # LDAP Auth > gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap" > # Syntax highlighter > gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' > # Git Wiki > gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib' > gem "raphael-rails", git: "https://github.com/gitlabhq/raphael-rails.git"; These are the only patched dependencies left. They told me they would create separate ruby gems for all of them, so that we would be able to package them separately from the original gems (i.e. having ruby-grack and then gitlab-ruby-grack). raphael-rails hasn't had such conversion yet, it seems. Would that situation suffice? I've just written the team another mail, asking how difficult would it be to use the original libs (adapting gitlab to them), seeing how gitlab has changed so much as of late. On Sun, Jun 09, 2013 at 18:14:32 +0200, Per Andersson wrote: > On Wed, Mar 13, 2013 at 11:15 AM, Daniel Martí <mvdan@mvdan.cc> wrote: > > (You don't need to CC me, I am already in the debian ruby lists) > > > > On Wed, Mar 13, 2013 at 10:24:52 +0100, Per Andersson wrote: > >> What are the changes that are incompatible with original upstream? > > > > As he said, "fixes and improvements". I did ask him if he could include > > them upstream, but got no reply so far. Will try again. > > > > Anyway, the changes are on github if you want to see them. > > > >> I suppose I would rather patch gitlab to use vanilla grit, if possible. > > > > Patching gitlab would be too much effort on our part IMHO, which would > > be replaced by a cooperative upstream. Thus why we're talking to Dmitriy > > :) > > > > I'll keep you posted. > > Any update on this? > > Best, > Per -- Daniel Martí - mvdan@mvdan.cc - GPG 0x58BF72C3
Attachment:
pgpnVeG7vFzcZ.pgp
Description: PGP signature