Permalink
Commits on Aug 10, 2016
  1. Merge pull request #58 from square/update-gems-and-jars

    Update default jetty, jruby-rack, gems and jars.  Also keep rubocop happy
    cheister committed on GitHub Aug 10, 2016
  2. Update default jetty, jruby-rack, gems and jars. Also keep rubocop happy

    Chris Heisterkamp committed Aug 10, 2016
Commits on Jun 7, 2016
  1. Merge pull request #57 from square/rob.new-jruby-and-bundler

    jruby 1.7.25 and bundler 1.12
    cheister committed Jun 7, 2016
  2. add dereference to copy of erb files

    Since jruby.erb is a symlink to ruby.erb we want to copy the contents of
    the file rather than the symlink. Without this the tests break when the
    ruby.erb file is removed then it attempts to read the jruby.erb file.
    robolson committed Jun 7, 2016
Commits on Jun 6, 2016
  1. Update travis.yml

    robolson committed Jun 6, 2016
  2. Lock webapp test projects to Rails 3

    Rails 4 is not compatible with ruby 1.9 and jetpack is still specifying
    the --1.9 flag
    robolson committed Jun 4, 2016
  3. Fix the download url for jetty

    the download location changed sometime in the past year
    robolson committed Jun 4, 2016
Commits on Jun 4, 2016
  1. Switch to jruby 1.7.25 everywhere

    upgrading from jruby 1.7.19
    robolson committed Jun 4, 2016
Commits on Jun 3, 2016
  1. Update to most recent bundler (~> 1.12.5)

    robolson committed Jun 3, 2016
Commits on Jun 3, 2015
  1. Merge pull request #52 from square/cheister/jetty-9

    Update defaults to jetty 9 and jruby 1.7.19 and rename settings.max_concurrent_connections
    cheister committed Jun 3, 2015
Commits on May 29, 2015
  1. Merge pull request #54 from danrarr/force-bundler-1.9.9

    Force installation of bundler 1.9.9
    cheister committed May 29, 2015
Commits on Mar 2, 2015
  1. fix rubocop warnings

    Chris Heisterkamp committed Mar 2, 2015
Commits on Mar 1, 2015
  1. update defaults to jetty 9.2.9, jruby-rack-1.1.18 and jruby 1.7.19

    Chris Heisterkamp committed Mar 1, 2015
  2. rename max_concurrent_connections setting to max_threads

    Chris Heisterkamp committed Mar 1, 2015
Commits on Dec 16, 2014
  1. fix rubocop warning

    Chris Heisterkamp committed Dec 16, 2014
  2. Merge pull request #50 from square/cheister/xss-rake-show-status

    Do not use the default error app in jruby-rack because Rack::ShowStatus has XSS vulnerability
    cheister committed Dec 16, 2014
  3. Do not use the default error app in jruby-rack because Rack::ShowStat…

    …us has XSS vulnerability
    Chris Heisterkamp committed Dec 16, 2014
Commits on Dec 12, 2014
  1. Merge pull request #49 from square/cheister/update-jar-versions

    update to latest jruby-rack and jetty 8 versions
    cheister committed Dec 12, 2014
  2. update to latest jruby-rack and jetty 8 versions

    Chris Heisterkamp committed Dec 12, 2014
Commits on Dec 10, 2014
  1. Merge pull request #48 from square/cheister/fakes-are-for-tests

    stop adding fake.* to every jet-packed app.
    cheister committed Dec 10, 2014
  2. stop adding fake.crt, fake.key, fake.p12, fake.jceks and fake.pem to …

    …every jetpacked app
    Chris Heisterkamp committed Dec 10, 2014
  3. Merge pull request #47 from square/cheister/generated-file-cleanup

    Update to rspec 3 and stop overlaying multiple copies of config files into the app directory
    cheister committed Dec 10, 2014
  4. add rubocop as part of the build

    Chris Heisterkamp committed Dec 10, 2014
  5. fix reloading_spec

    Chris Heisterkamp committed Dec 10, 2014
  6. Be more careful about how we overlay files so they don't get copied i…

    …nto multiple places
    Chris Heisterkamp committed Dec 10, 2014
Commits on Dec 9, 2014
  1. fix specs

    Chris Heisterkamp committed Dec 9, 2014
  2. use verbose setting for FileUtils methods

    Chris Heisterkamp committed Dec 9, 2014
  3. add some parens

    Chris Heisterkamp committed Dec 9, 2014
  4. move to rspec3 syntax

    Chris Heisterkamp committed Dec 9, 2014
  5. use rubocop style standards

    Chris Heisterkamp committed Dec 9, 2014
Commits on Jun 4, 2014
  1. Merge pull request #46 from robbiegill/pr-configurable-bundle-without

    Add configurable option for bundle --without
    ggilder committed Jun 4, 2014
Commits on Jun 1, 2014
  1. Adds configuration for bundle --without <groups>

     - Optionally specify groups to bundle without instead of the default %w(test development)
    robbiegill committed Apr 10, 2014
Commits on May 15, 2014
  1. Merge pull request #45 from square/jetty9-compat

    support jetty 9
    cheister committed May 15, 2014