Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-12 Thread Maarten Coene
Any idea where this commit comes from?I didn't touch any of these files as far as I know... Maarten - Doorgestuurd bericht - Van: "maart...@apache.org" Aan: notificati...@ant.apache.org Verzonden: woensdag 12 juli 10:06 2017 Onderwerp: [2/2] ant-ivy git commit: Merge remote-t

Re: AW: [VOTE] IvyDE requirements

2017-07-12 Thread Maarten Coene
+1 Maarten Van: Jan Matèrne (jhm) Aan: 'Ant Developers List' Verzonden: woensdag 12 juli 6:59 2017 Onderwerp: AW: [VOTE] IvyDE requirements summa summarum +2 ;-) Jan > -Ursprüngliche Nachricht- > Von: Gintautas Grigelionis [mailto:g.grigelio...@gmail.com] > Gesendet: Die

Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-12 Thread Jaikiran Pai
I'm guessing that while committing the fix for IVY-1404 you probably did a "git merge" against latest master of upstream, which created this merge commit. -Jaikiran On 12/07/17 1:45 PM, Maarten Coene wrote: Any idea where this commit comes from?I didn't touch any of these files as far as

Re: ant-ivy git commit: An asciidoctor macro to create links to Jira

2017-07-12 Thread Nicolas Lalevée
I look deeper into asciidoctor and asciidoctor-ant, and I have managed to create a simple macro. It creates links to jira just by declaring the name of the issue. The Ant tasks only supports macro implemented in Java, not Ruby, even if it seems that asciidoctor itself might support them in Ruby

Re: Fw: [2/2] ant-ivy git commit: Merge remote-tracking branch 'origin/master'

2017-07-12 Thread Maarten Coene
I remember IntelliJ was saying something about a failed commit asking me to merge to the last revision. I still don't understand why this results in 2 commits. (my knowledge of git is very limited as you can see) But I guess this is ok? Or should it be reverted somehow? Maarten Van: Jaiki

[GitHub] ant-ivy pull request #:

2017-07-12 Thread twogee
Github user twogee commented on the pull request: https://github.com/apache/ant-ivy/commit/6f22f4b49c2a3a59840d28e6cbe0c37a56ab1f90#commitcomment-23069324 Neat! 👍 Perhaps it would make sense to ask asciidoctorj team to add support for inlined Ruby and ditto for asciidoctor-ant? -