Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/warbler
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jruby/warbler
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.x-dev
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 15 files changed
  • 1 contributor

Commits on Apr 30, 2016

  1. [travis-ci] use a pattern for dev/feature/fix branches to test

    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    6d0e674 View commit details
    Browse the repository at this point in the history

  2. [travis-ci] test with recent jruby 1.7.x and bundler version

    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    8d49451 View commit details
    Browse the repository at this point in the history

  3. [travis-ci] rake version tuning + avoid RAKEVERSION global constant

    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    ae50e25 View commit details
    Browse the repository at this point in the history

  4. [spec] use a relaxed >= rake version in *tester.gemspec*

    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    d26be13 View commit details
    Browse the repository at this point in the history

  5. do not depend on rdoc (in .gemspec) even as a development dep

    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    1a31925 View commit details
    Browse the repository at this point in the history

  6. add back rdoc gem (into *Gemfile*) and use group development/test for… 

    … rake as well
    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    afacd61 View commit details
    Browse the repository at this point in the history

  7. update rdoc gem - specs actually depend on it having a runtime (json)… 

    … gem dependency
    @kares
    kares committed Apr 30, 2016
    Configuration menu
    Copy the full SHA
    74aafba View commit details
    Browse the repository at this point in the history

Commits on May 25, 2016

  1. bring war_name back as an alias of jar_name

    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    c2db2d6 View commit details
    Browse the repository at this point in the history

  2. stay silent when we should

    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    6965523 View commit details
    Browse the repository at this point in the history

  3. only config.gems add rails gem if *Gemfile* not found (not a Bundler … 

    …setup)
    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    79cfb4f View commit details
    Browse the repository at this point in the history

  4. allow to bundle config.gems with Bundler + do not replace config.bund… 

    …ler if set
    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    3538b99 View commit details
    Browse the repository at this point in the history

  5. consider gemspec.bindir when locating executables 

    better fix for #332 (61cbd47)

which also resolves #338
    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    8b4af36 View commit details
    Browse the repository at this point in the history

  6. [spec] missed gem executable for previous commit

    @kares
    kares committed May 25, 2016
    Configuration menu
    Copy the full SHA
    27e3acb View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2016

  1. do not possibly include default jars twice (when filtering with move_… 

    …jars_to_webinf_lib)
    @kares
    kares committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    839b78c View commit details
    Browse the repository at this point in the history

  2. prepare for 1.4.10

    @kares
    kares committed Oct 4, 2016
    Configuration menu
    Copy the full SHA
    4b1d45a View commit details
    Browse the repository at this point in the history
Loading