Cyril Rohr | 6c99e21c0ff | Merge remote-tracking branch 'upstream/master'
Conflicts:
lib/language_pack/fetcher.rb | | |
Richard Schneeman | e3854a97445 | Merge pull request #499 from heroku/schneems/bundler-1-13-2
Bundler 1.13.2 | | |
Richard Schneeman | bde60507ce1 | Merge pull request #498 from heroku/schneems/detect-rake-tasks
Announce when we detect Rake tasks | | |
schneems | 69493df17d7 | Bundler 1.13.2 | | |
schneems | c76f9e89b2a | Announce when we detect Rake tasks
Right now people are putting infinite scripts in their rakefile and it looks like... | | |
Richard Schneeman | ca1b963cf16 | Merge pull request #497 from znz/fix-typo
Fix a typo | | |
Kazuhiro NISHIYAMA | 8d8e0ae2aa1 | Fix a typo | | |
Richard Schneeman | 7ff3b7726ae | Merge pull request #496 from heroku/schneems/bundler-13
Bundler v1.13.1 | | |
schneems | 496a64c31c1 | Bundler v1.13.1 | | |
Terence Lee | ce11aca6492 | Merge pull request #494 from JuanitoFatas/doc/bundler-new-website
Update Bundler website url in README.md [ci skip] | | |
JuanitoFatas | 79a2fa2a594 | Update Bundler website url [ci skip] | | |
Jonah Hirsch | 21775d62252 | Mention that non-recommended usages are not recommended in warning output | | |
Richard Schneeman | cdef996abe8 | Merge pull request #488 from heroku/schneems/fuuuuuuuuuuuu-ruby-version-specifiers
Revert "Revert "Bump bundler 1.12... | | |
schneems | 0ec19283b6e | Revert "Revert "Bump bundler 1.12.5""
This reverts commit 088683acf9f6edde85179061480ec1850956cc2f.
This PR bumps u... | | |
schneems | 088683acf9f | Revert "Bump bundler 1.12.5"
This reverts commit 377d8536b9d2571e9b78b14b90a8dc11da7bca8d.
Caused an issue internal... | | |
Richard Schneeman | 6cca948ea7a | Merge pull request #484 from heroku/schneems/bundler-fuzzy-version
Bump bundler 1.12.5 | | |
schneems | 377d8536b9d | Bump bundler 1.12.5
Allows for Ruby version operators such as
```
ruby "~> 2.3.1"
```
When you bundle with this se... | | |
schneems | 9a03fa01017 | Update parallel_test && rspec retry
Apparently some rspec behavior changed with regard to the `pending` tag. Comment... | | |
Richard Schneeman | 84c7579b7de | Merge pull request #486 from TheNotary/patch-2
makes node come in over https rather than http | | |
TheNotary | 28f8a8da0b0 | makes node come in over https rather than http
I haven't tested this on Heroku, so be sure to double check nothing o... | | |
Cyril Rohr | a3bda20157e | buildcurl | | |
Richard Schneeman | 52b7238c748 | Merge pull request #478 from znz/fix-typo
Fix a typo | | |
Kazuhiro NISHIYAMA | 8e8a777f169 | Fix a typo | | |
schneems | a309797a663 | bump to v146 | | |
schneems | c8ba623992c | v146 | | |
Richard Schneeman | ea1e8140f00 | Link to bundler configuration article | | |
Richard Schneeman | a62768634a0 | Merge pull request #475 from heroku/schneems/fix-railties-fail
debugging | | |
schneems | 413879d1f26 | Fix raise on fail behavior | | |
Richard Schneeman | 97823dac28c | Merge pull request #474 from heroku/schneems/performance-m-web_concurrency
Performance-M WEB_CONCURRENCY data | | |
Richard Schneeman | f676bd8ddee | Merge pull request #471 from heroku/schneems/warn-bundle-config
Warn on .bundle/config file presence | | |
Richard Schneeman | 2ba32e6489f | Performance-M WEB_CONCURRENCY data | | |
Richard Schneeman | 8d1ed781d9c | Merge pull request #473 from heroku/mattgraham-patch-1
Update buildpack image to align with marketing | | |
Matt Graham | a58aa352814 | Update README.md | | |
schneems | 0b7ad94efc8 | Warn on .bundle/config file presence
Discussion at https://github.com/bundler/bundler/issues/4351#issuecomment-19449... | | |
schneems | e9e442eb706 | [ci skip] v145 | | |
Richard Schneeman | 518ab6a03f3 | Merge pull request #462 from heroku/schneems/fail-on-assets-rails
[close #358] Fail on Rake detect for Rails Apps | | |
Richard Schneeman | ad42bdde3cf | Update ruby.rb | | |
Richard Schneeman | 5301fb9109f | Merge pull request #468 from heroku/schneems/fix-bundler-warning-more
Use correct metadata directory | | |
schneems | 5b673061755 | Use correct metadata directory | | |
schneems | 92ca39e3d41 | [close #358] Fail on Rake detect for Rails Apps
Rails applications should be reasonably expected to run `rake` when ... | | |
Richard Schneeman | 0287055d60a | Update ruby.rb | | |
Richard Schneeman | c7ccbbbe491 | Update ruby.rb | | |
Richard Schneeman | 75a7ad335b3 | Merge pull request #465 from heroku/schneems/better-bundler-error2
Alternative to #463 always warn on Bundler change | | |
Richard Schneeman | 634bc184116 | Merge pull request #467 from heroku/schneems/fix-default-env-vars
Fix config vars for existing apps | | |
schneems | bd34c649654 | Fix config vars for existing apps
We weren't setting the environment variables for older apps :( | | |
schneems | 9d2bef702d4 | Alternative to #463 always warn on Bundler change
Warn when upgrading bundler version. Instead of trying to detect e... | | |
Richard Schneeman | 510c2d6e71e | Merge pull request #464 from heroku/schneems/env-var
Platform changes prevent unacceptable env vars | | |
schneems | 8057f8e4b39 | Platform changes prevent unacceptable env vars
Due to platform changes we can no longer set weird env var names. Thi... | | |
schneems | e738ee04d2c | [ci skip] changelog | | |
Richard Schneeman | e34fb2494b7 | Merge pull request #461 from heroku/bundler_11.2
Upgrade bundler to 1.11.2 | | |
Richard Schneeman | 006b9b2050f | Merge pull request #460 from heroku/rails-5
Rails 5 | | |
Damien Mathieu | 5c6f078ef82 | upgrade bundler to 1.11.2 | | |
schneems | c9fae9a4607 | Enable STDOUT logging via rails/rails#23734
Do not warn when rails_12factor not enabled. | | |
schneems | 362d624c07e | Allow beta versions to be flagged into Rails 5 | | |
Richard Schneeman | 354ff7a483e | Merge pull request #459 from heroku/schneems/procfile-warning-redux
Warn on no Procfile use, don't mention Webrick | | |
schneems | f4a51f795fd | Warn on no Procfile use, don't mention Webrick
While someone __may__ be using webrick they may also be puma or some ... | | |
Terence Lee | 7f8b1a0172d | bump to v144 | | |
Terence Lee | c4fc3c2805a | update changelog | | |
Terence Lee | be917105f77 | Merge pull request #433 from heroku/circleci
Circle CI | | |
Terence Lee | 4d211caf6d5 | replace TRAVIS with generic CI | | |
Terence Lee | da95cd705f0 | initial circleci support | | |
Terence Lee | 84b333727a8 | Merge pull request #457 from heroku/sleep-bw-runs
Added sleep between one-off dyno runs in test | | |
Joe Kutner | be351c37c52 | Added sleep between one-off dyno runs in test | | |
Terence Lee | fc29f3fc35d | set this test to pending for now until free allows more than 1 process type | | |
Terence Lee | 7483cbef3e5 | Merge pull request #456 from heroku/fix-default-ruby-224
Fix default Ruby to be 2.2.4 | | |
Terence Lee | b728d25acc2 | remove duplicate DEFAULT_RUBY_VERSION constant | | |
Terence Lee | 3ac83a711a5 | actually set 2.2.4 | | |
Terence Lee | 33d6b2a8198 | bump to v143 | | |
Terence Lee | bc1152d5e40 | update changelog | | |
Terence Lee | 2ee415059a7 | Merge pull request #454 from heroku/default-ruby-22
change default ruby to 2.2.4 from 2.0.0 | | |
Terence Lee | 20c3e4fdb0d | change default ruby to 2.2.4 from 2.0.0
Ruby 2.0.0 is being sunset on Feb. 24, 2016. This changes the default
for ne... | | |
Terence Lee | d5853968994 | JDK9 test should check for 9-internal from @jkutner | | |
schneems | 230fa0dcbe8 | v142 | | |
Richard Schneeman | 61c13d40632 | Merge pull request #450 from heroku/pgconfig
Added pgconfig jar to JDK for JRuby JDBC | | |
Joe Kutner | 119bc88311c | Use a fetcher to retrieve pgconfig.jar | | |
Joe Kutner | 248b30a4207 | Added pgconfig jar to JDK for JRuby JDBC | | |
Richard Schneeman | 43a34feb85d | Merge pull request #449 from heroku/heroku-postgres
don't specify the heroku-postgresql plan, let addon pick | | |
Terence Lee | 37c0375cf66 | don't specify the heroku-postgresql plan, let addon pick | | |
Richard Schneeman | d05b8804837 | Merge pull request #444 from heroku/schneems/443
Instruct curl to follow redirects. | | |
Richard Schneeman | 2b5a7215a6c | Merge pull request #445 from rstacruz/patch-1
Readme: fix typo | | |
Rico Sta. Cruz | 3063d8026f9 | Readme: fix typo | | |
Brian Shirai | cd90f65a981 | Instruct curl to follow redirects. | | |
Richard Schneeman | ad2eb907be5 | Merge pull request #438 from aminjam/master
Java Memory should use the default 384m | | |
Richard Schneeman | 7b359a9a699 | Merge pull request #434 from heroku/jruby-jvm-preinstall
Added a check for preinstalled JDK | | |
Joe Kutner | 632eca67b15 | Updated heroku-api to 0.4.0 | | |
Amin Jams | d6dde3cc621 | Java Memory should use the default 384m
Java Memory should use the default 384m when setting the JAVA_MEM env variab... | | |
Joe Kutner | 490e6268710 | Added jvm spec and upgraded heroku-api gem | | |
Joe Kutner | ec8f64314bb | Added a check for preinstalled JDK. Used with jvm-common bp | | |
schneems | 8d7d58a77c8 | bump to v141 | | |
schneems | f1cf3c874e8 | [ci skip] Changelog for v141 | | |
Richard Schneeman | 342e73b3ef4 | Merge pull request #432 from heroku/jkutner/java-mem
Replace JAVA_TOOL_OPTIONS with JAVA_MEM to avoid JRuby overriding | | |
Joe Kutner | 694c3039e71 | Replace JAVA_TOOL_OPTIONS with JAVA_MEM to avoid JRuby overriding | | |
Richard Schneeman | 123bdda425d | Merge pull request #429 from heroku/schneems/fix-node-detection
Fix node buildpack detection | | |
schneems | 3a10c6cf522 | Fix node buildpack detection | | |
Richard Schneeman | 45ad23c2a77 | Merge pull request #430 from heroku/indent-java-tool-opts
Suppress JAVA_TOOL_OPTIONS message | | |
Terence Lee | 8e037b688f2 | Merge pull request #428 from heroku/jruby-ix
Added automatic heap settings for IX dyno | | |
Joe Kutner | 19c1dd55359 | Added jruby build opts msg | | |
Joe Kutner | cf2bc04c9ec | Use run_stdout to ensure JAVA_TOOL_OPTS | | |
Terence Lee | acf667f7f9c | Merge pull request #426 from heroku/jkutner-patch-1
Update changelog for #423 | | |
Joe Kutner | 38fa92b0ec3 | Added automatic heap settings for IX dyno | | |
Richard Schneeman | 606c1aae324 | Merge pull request #427 from heroku/schneems-patch-1
Use non default node version for tests | | |
Richard Schneeman | 4fc28792b13 | Use non default node version for tests
Previously we were checking for a custom version that coincidentally matched ... | | |
Joe Kutner | 85cb56b9e2b | Update changelog [skip ci] | | |
Richard Schneeman | 53b02b404b6 | Merge pull request #423 from heroku/custom-jdk-props
Added support for custom JDK versions | | |
Richard Schneeman | 8db0a60e1d0 | Merge pull request #424 from stefansundin/master
Add warning if not running on Linux | | |
Stefan Sundin | 0f1b898b64e | Add note that the buildpack requires 64-bit Linux to README.md. | | |
Joe Kutner | d5a4f01f8af | Added support for custom JDK versions | | |
Richard Schneeman | fbc18b55642 | Merge pull request #420 from heroku/schneems/moar-warnings
Emit more best practice warnings. | | |
schneems | c4a7cfb403e | Emit more best practice warnings.
Instead of waiting for users to do bad things, and open support tickets to tell th... | | |
Terence Lee | b017193b677 | bump to v140 | | |
Terence Lee | 09b01b426fa | v140 changelog | | |
Terence Lee | a546b8293a2 | update changelog | | |
Joe Kutner | 8150fb62ca6 | Added a JRuby specific error message if version is not found | | |
Terence Lee | d65a02fbe85 | Merge pull request #417 from heroku/travis-container
upgrade to container based travis | | |
Terence Lee | 075809162f4 | upgrade to container based travis
http://docs.travis-ci.com/user/migrating-from-legacy/ | | |
Terence Lee | 4c1c38b79c6 | Merge pull request #416 from heroku/kill_cedar_10_tests
remove/fix tests referencing cedar-10 | | |
Terence Lee | 29dea02b1e1 | remove/fix tests referencing cedar-10 | | |
schneems | bde621b40c8 | bump to v139 | | |
schneems | 300ec22afb0 | [ci skip] v139 | | |
Richard Schneeman | 154fab366ff | Merge pull request #408 from zunda/show-version-is-bundler
Clarify top is showing version of bundler | | |
zunda | 69f40b726e7 | Clarify top is showing version of bundler | | |
Richard Schneeman | 526dfadca80 | Merge pull request #404 from heroku/schneems/feature/activerecord_41
Running tests for #403 | | |
schneems | a80bba6ca21 | Clean up some logic and changelog
We want to preserve functionality people may be relying on (i.e. apps without acti... | | |
Damon Morgan | be1ac0d8c61 | Don't write database.yml if using ActiveRecord >= 4.1 | | |
Richard Schneeman | e8be1e14ef8 | Merge pull request #406 from heroku/schneems/orlando
Running tests for #402 | | |
Orlando Del Aguila | 613defce8ec | don't overwrite files when loading public/assets from cache | | |
Richard Schneeman | 48058e67085 | Merge pull request #405 from heroku/schneems/fix-tests
Fix 422 response from heroku APi | | |
schneems | 61b910f793f | Fix status 422
The DATABASE_URL was already being set correctly on some apps so when we tried to provision and upda... | | |
Richard Schneeman | a7a1942dea5 | Merge pull request #401 from orlando/fix/hatchet-config-readme
adding hatchet setup information to readme | | |
Matt Graham | 5e6c688a8fa | Merge pull request #397 from heroku/mattgraham-patch-1
Update readme with banner image. | | |
Orlando Del Aguila | 2a044313d63 | improving copy | | |
Orlando Del Aguila | 249624ee45f | adding hatchet setup information to readme | | |
Matt Graham | 6efb03536f0 | updated image, already | | |
Matt Graham | bf92fc02e96 | Update readme with banner image. Thoughts? | | |
Terence Lee | 4bf2811456e | Merge pull request #391 from DyegoCosta/fix-detect
Allow path with spaces to be detected as Ruby | | |
Dyego Costa | 6c0b352b46e | Allow path with spaces to be detected as Ruby | | |
Terence Lee | 93ff10a9520 | Merge pull request #372 from DyegoCosta/shell-detect
Use shell in Detect for speed | | |
Terence Lee | e4e0d1dd4a2 | Merge pull request #390 from joneslee85/patch-2
Fix the link to Getting Started with Ruby [ci skip] | | |
Trung Lê | ef6dbd2a678 | Fix the link to Getting Started with Ruby
I know, Ruby is not yet replaced by NodeJS yet.... :trollface: | | |
schneems | 4b493f80ed9 | bump to v138 | | |
schneems | ef74a702589 | [ci skip] v138 changelog | | |
Richard Schneeman | 1636c7d71e4 | Update Changelog | | |
Richard Schneeman | a83153a18f8 | Merge pull request #385 from heroku/indirect-patch-1
Update Bundler version | | |
schneems | 5c5ed3fc054 | Fix for bundler 1.9 regression
Previously bundler would emit an error message when `bundle platform --ruby` was exec... | | |
André Arko | 6b3f3c71f4a | Update Bundler version
This updates the version of Bundler used to the current newest version, 1.9.7.
We've been co... | | |
schneems | d2d08e2b1e5 | Don't raise on newer bundler versions | | |
Richard Schneeman | 2ba9fc8378c | Merge pull request #382 from heroku/mhale-tmp-fixes
Tmpdir cleanup fixes | | |
Terence Lee | e99ccea2cf3 | bump to v137 | | |
Terence Lee | 02e2a24d10b | update changelog | | |
Terence Lee | 5a7baefa357 | Merge pull request #384 from heroku/jkutner/jruby-opts-fix
Added a redeploy step to JRuby test to cover jruby_opts a... | | |
Joe Kutner | 457805f2224 | removed jruby_opts check from test that doesn't have the code for it | | |
Joe Kutner | f9b1c3a13f1 | Added a redeploy step to JRuby test to cover jruby_opts at build time
Added test for jruby_opts output during build
... | | |
Michael Hale | 5fac73c50ae | Clean up after bundler | | |
Michael Hale | 710543c001f | Add hack to cleanup after bundler | | |
Michael Hale | 17726a09c97 | Remove the tmpdir (not just the bundler dir under it) | | |
Michael Hale | 4f0b77a5687 | Ensure only one instance of BundlerWrapper is created | | |
Terence Lee | 5e693eb7f50 | bump to v136 | | |
Terence Lee | b0ba46eac0c | update readme | | |
Terence Lee | 5d44bbe16f5 | Merge pull request #381 from heroku/jkutner/jruby-opts-fix
Added override config var to build-time jruby-opts | | |
Joe Kutner | 270381f058f | Added override config var to build-time jruby-opts | | |
schneems | e1482d5b00f | [ci skip] fix buildpack release | | |
schneems | 8c772bd3c2a | bump to v135 | | |
schneems | b89dd3582a7 | [ci skip] Changelog v135 | | |
Richard Schneeman | 3e743451c4b | Merge pull request #376 from segiddins/patch-1
Update README.md | | |
Samuel E. Giddins | a1714ba006c | Update README.md | | |
Cyril David | e481b157e1d | Add entry in changelog about cleaning `.git` folders | | |
Richard Schneeman | 9b678599961 | Merge pull request #375 from heroku/clean-dot-git-in-vendor-base
First stab at cleaning out the .git folders | | |
Richard Schneeman | 6f6cc7fb2e5 | Merge pull request #373 from heroku/schneems/test-handle_new_manifest_filename
Schneems/test handle new manifest fil... | | |
fjg | 93b2b9433ce | feat(sprockets): support new sprockets filename
Sprockets 3.0.0 introduced a [new naming convention for the manifest... | | |
Dyego Costa | 9fe7266ba4b | Use shell on detect for speed | | |
Richard Schneeman | 165d85b1114 | Merge pull request #360 from heroku/remove-ctrlc
Remove ctrl+C message | | |
Cyril David | cd8894dd7b6 | First stab at cleaning out the .git folders | | |
Joe Kutner | 4ed54a0f9d4 | Update CHANGELOG.md [skip ci] | | |
Terence Lee | 2e2a4971af6 | Merge pull request #361 from heroku/jkutner/jruby-opts-dev
Set dev flag for JRuby builds. | | |
Joe Kutner | 10ff2183d94 | Set dev flag for JRuby builds. This optimizes for short tasks. Fixes #356 | | |
Terence Lee | fd5d1a823f7 | update README | | |
Cyril David | eaf422738b5 | Remove ctrl+C message
We're proposing to remove supporting the behavior moving
forward. | | |
schneems | bac6cf0953a | bump to v134 | | |
schneems | 625415d8c20 | v134 changelog | | |
Richard Schneeman | ebf640b0855 | Merge pull request #350 from heroku/schneems/sensible-defaults
Use more generic flag for sensible default detect | | |
schneems | ba669eb7c75 | Use more generic flag for sensible default detect | | |
Richard Schneeman | cf14a7817e9 | Merge pull request #341 from heroku/fail-if-missing-stack-env
Fail fast if ENV["STACK"] is missing | | |
Richard Schneeman | 9f41bdbfff6 | Merge pull request #349 from heroku/schneems/rails-5
Enable Rails 5 to work on Heroku | | |
schneems | 479285865e8 | Enable Rails 5 to work on Heroku
- Set RAILS_SERVE_STATIC_FILES by default on Rails 4.2+ (rails/rails#18100) | | |
schneems | e57004c04d8 | changelog for heroku/heroku-buildpack-ruby#347 | | |
Richard Schneeman | 45ddeac64af | Merge pull request #344 from heroku/schneems/DEFAULT_WEB_CONCURRENCY
Allow opting in to default WEB_CONCURRENCY | | |
schneems | 1511a6e67b7 | Allow opting in to default WEB_CONCURRENCY
cc/@craigkerstiens | | |
Terence Lee | b2a953d0581 | Merge pull request #347 from heroku/bundle_clean
Make `bundle clean` have the same context as `bundle install` | | |
Next → |