Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Latest heroku-buildpack-ruby from upstream #5

Open
wants to merge 665 commits into
base: master
Choose a base branch
from
Open

Latest heroku-buildpack-ruby from upstream #5

wants to merge 665 commits into from

Conversation

willthames
Copy link

Merge in v134 of https://github.com/heroku/heroku-buildpack-ruby

To see differences:

git remote add upup https://github.com/heroku/heroku-buildpack-ruby
git fetch upup master
git diff upup/master

schneems and others added 30 commits February 3, 2014 14:23
@schneems
Test upgrading ruby versions
aaa17c7
@hone
bump libyaml to 0.1.5 for CVE-2013-6393
ac6554c
@schneems
hatchet now takes care of git config
a421fb8
@schneems
Merge pull request heroku#223 from heroku/schneems/version-change-test
9aa34d6 
Test upgrading Ruby versions
@hone
recompile psych if it's compiled with 0.1.4
bdf2b6a
@hone
Merge pull request heroku#224 from heroku/libyaml
78ac43a 
compile psych with libyaml 0.1.5
@hone
update changelog
64407c1
@hone
bump to v99
78311b7
@hone
update changelog
6389f7e
@hone
take into account buildpack v99 was a noop
0f18299
@hone
bump to v100
b1c209f
@hone @schneems
read user ENV settings for both user-env-compile or buildpack-env-arg
7203ca0
@hone @schneems
quote env vars
e2f7016
@hone @schneems
remove run_with_env
2e43dac 
run supports everything run_with_env does, so let's use that
@schneems
Merge pull request heroku#219 from heroku/ponies
d659cb8 
buildpack-env-arg fixes
@schneems
fix rake detection when DATABASE_URL not present
74ed870 
Introduced `rake_env` to LanguagePack interface. Renamed `default_database_url` to `database_url`.
@schneems
travis
7e95dca
@hone
Merge pull request heroku#214 from heroku/schneems/database_url_issue
c01a03e 
fix rake detection when DATABASE_URL not present
@hone
update changelog
4f69adf
@hone
push to github before tagging/releasing
dd02c68
@hone
bump to v101
6e02f44
@hone
fix github_remote extraction
3d3e69e
@hone
pass output options to pipe
3e2c972
@hone
actually use the blacklist env vars
cdfc16c
@hone
Merge pull request heroku#225 from heroku/path_debug
2eb97fc 
more pony fixes
@hone
update changelog
a3d9d77
@hone
bump to v102
17a3447
@hone
restrict Rails 4 detect to be 4.0.x only
9d469e5
@hone
set config vars on first push again
2d05f00
@hone
Rails 4.1 support
41dd02b 
* don't write `config/database.yml` in Rails 4.1, See rails/rails#13463 (comment).
* setup env var SECRET_KEY_BASE for Rails 4.1's `config/secrets.yml`
hone and others added 29 commits January 21, 2015 14:01
@hone
special case for patchlevel rubies. fixes jruby 9.0.0.0.pre1
58ab672
@hone
Merge pull request heroku#338 from heroku/jruby-px-heap-fix
ccdcd56 
Scale back JRuby heap size on PX dynos
@hone
Merge pull request heroku#340 from heroku/jruby_9000
881d794 
special case for patchlevel rubies. fixes jruby 9.0.0.0.pre1
@hone
update changelog [ci skip]
35fa3f1
@hone
bump to v132
2628ef9
Fail fast if ENV["STACK"] is missing
00a39d8
@schneems
bundler 1.7
4d6c831
@schneems
Merge pull request heroku#342 from heroku/schneems/bundler-17
4d4e102 
bundler 1.7
@schneems
bump to v133
a9ad1a1
@schneems
changelog for 133
fc99e32
@schneems
don't vendor in JVM on cedar-14 as it's now available on the stack.
e375195
@schneems
Merge pull request heroku#343 from heroku/schneems/remove-jvm
20b99c8 
don't vendor in JVM on cedar-14 as it's now available on the stack.
@hone
control all of our test repos
7dbceff
@hone
Merge pull request heroku#346 from heroku/fix_jruby_test
4e166ec 
control all of our test repos
@hone
use same bundler bin for every bundler command
6eac8fd
@hone
pass user env to bundle clean, since it should run in the same env as…
89d563d 
… bundle install
@hone
Merge pull request heroku#347 from heroku/bundle_clean
b2a953d 
Make `bundle clean` have the same context as `bundle install`
@schneems
Allow opting in to default WEB_CONCURRENCY
1511a6e 
cc/@craigkerstiens
@schneems
Merge pull request heroku#344 from heroku/schneems/DEFAULT_WEB_CONCUR…
45ddeac 
…RENCY

Allow opting in to default WEB_CONCURRENCY
@schneems
changelog for heroku#347
e57004c
@schneems
Enable Rails 5 to work on Heroku
4792858 
- Set RAILS_SERVE_STATIC_FILES by default on Rails 4.2+ (rails/rails#18100)
@schneems
Merge pull request heroku#349 from heroku/schneems/rails-5
9f41bdb 
Enable Rails 5 to work on Heroku
@schneems
Merge pull request heroku#341 from heroku/fail-if-missing-stack-env
cf14a78 
Fail fast if ENV["STACK"] is missing
@schneems
Use more generic flag for sensible default detect
ba669eb
@schneems
Merge pull request heroku#350 from heroku/schneems/sensible-defaults
ebf640b 
Use more generic flag for sensible default detect
@schneems
v134 changelog
625415d
@schneems
bump to v134
bac6cf0
@hone
update README
fd5d1a8
@willthames
Latest heroku-buildpack-ruby
5ea8784 
Merged v134 of https://github.com/heroku/heroku-buildpack-ruby
@tml
Copy link

tml commented Aug 28, 2015

👍

Currently, this buildpack cannot be used on Cedar-14; given that Cedar is scheduled for EOL very soon, I hope @jgarber can merge this and get the buildpack working on the new platform.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@willthames @tml @schneems @hone @benizi @yangchenyun @crohr @arthurnn @jkutner