Skip to content
This repository has been archived by the owner on Feb 2, 2018. It is now read-only.

Merge upstream and update bower 1.2.6 #10

Merged
merged 105 commits into from
Sep 4, 2013
Merged

Merge upstream and update bower 1.2.6 #10

merged 105 commits into from
Sep 4, 2013

Conversation

juno
Copy link
Member

@juno juno commented Sep 4, 2013

  • merge upstream v79
  • update bower to 1.2.6

schneems and others added 30 commits June 22, 2013 18:21
@schneems
Rspec Retry
da77a64 
Since we're dealing with intermittent failures and retrying code anyway, just retry the whole test if it fails once.


https://github.com/y310/rspec-retry
@schneems
rev hatchet 0.2.0
915f741
@schneems
Merge pull request #111 from heroku/schneems/rspec-retry
f3c4145 
Rspec Retry
@schneems
Merge pull request #112 from heroku/schneems/rev-hatchet2
1e29549 
rev hatchet 0.2.0
@schneems
Verify Rails 3 to 4 without ./bin works
ae9790b 
Looks like it is good to go. Using new major release of Hatchet that fixed all sorts of compatibility issues with running interactive consoles. Split all of that code into a separate lib: https://github.com/schneems/repl_runner
@schneems
Merge pull request #114 from heroku/schneems/rails4-no-bin
f1dc1b1 
Verify Rails 3 to 4 without ./bin works
@hone
fix typo, thanks @will
21c2d2f
@jkrall
Update rails3.rb
12165d3 
Support dummy postgres DATABASE_URL for jruby
@hone
Merge pull request #116 from jkrall/master
a88935f 
Fix DATABASE_URL bug for jruby rails apps
@hone @schneems
Instrument the buildpack
0de7288
@schneems
Merge pull request #117 from heroku/schneems/logplex
77fe377 
Instrument the buildpack
@hone
fix buildpack version
71c156b
@hone
remove lxpc error messages
d1e5bbf
@hone
update changelog
4ac9bd6
@hone
update changelog
99d9c1e
@hone
v67
5502c6c
@hone
extract fetcher
258ce51
@hone
cache bundler so it's only downloaded once
8200912
@hone
add cdn config file
ddb7d87
@hone
update changelog
73993bd
@hone
instrument buildpack_version
bcfa7c0
@hone
fix ruby version gemfile formatting in warning
3f7fc02
@hone
update changelog
7450df4
@hone
log buildpack name
3f54050
@hone
log when entering rails 3 or 4 compile
713709f
@hone
update changelog
b286d79
@hone
v68
530d103
@hone
add space to buildpack instrumentation messages
bb03ebb
@hone
update changelog
cdd6e4e
@hone
v69
969827a
schneems and others added 27 commits August 9, 2013 10:08
@schneems
Merge pull request #128 from heroku/schneems/lpxc-fix
edac489 
[close #127] Fix LPXC Deadlock Error
@schneems
Clean up plugin logic and warning text
1ee1677 
added a test
@schneems
Merge pull request #126 from heroku/schneems/plugin-warnings
34f5f70 
Clean up plugin logic and warning text
@schneems
Bugfix and More tests for plugin logic
9eb3fc1
@hone
Merge pull request #132 from heroku/schneems/less-inheritance-in-plugins
968736e 
Bugfix and More tests for plugin logic
@hone
Revert "Merge pull request #132 from heroku/schneems/less-inheritance…
6663f5e 
…-in-plugins"

This reverts commit 968736e, reversing
changes made to 34f5f70.

Still some issues with this Pull Request. Going to work on it some more.
@hone
remove extra '--' from warnings
2f3e3d1
@schneems
Symlink ruby.exe to ruby
ed235df 
Rails 4 introduced the `bin/` directory to generated projects with executables `rails`, `bundle`, `rake`, etc. The file generated on windows has a link to an incorrect `ruby.exe` in the shebang line. See #134.

This PR adds a symlink so that `ruby.exe` can be called in addition to `ruby.
@hone
should set $GEM_PATH as well for the build process
c944525 
if this isn't setup properly, locally it might pick the wrong bundler
@schneems @hone
Bugfix and More tests for plugin logic
8d889f3 
Actually testing for presence of directories now !
@hone
rails 4 plugin work
1305e3d 
* move rails_12factor gem test to the beginning
* test against ruby 2 since that's the new default
* rails_12factor not rails_12_factor
@hone
rails 3 plugin work
494a67e 
* gem and plugin names are different
* rails_12factor not rails_12_factor
@hone
only warn once about plugin injection in rails 3
9055967
@schneems @hone
fix specs
728657f
@hone
use PluginInstaller for runtime asset compilation
a8341db
@hone
set deprecation notices for runtime assets compilation
d60256f
@hone
fix specs
672e18a
@hone
update changelog
2e080a3
@hone
v78
fd4dfc0
@hone
remove debug output from LXPC
e88b9c5 
If someone is using user-env-compile and sets DEBUG to true, then the
output will be displayed causing a build failure.
@hone
Merge pull request #139 from heroku/schneems/rails4-windows-fix
3e45b29 
Symlink ruby.exe to ruby
@hone
fix syntax error in spec
fff8ff4
@hone
Merge pull request #141 from heroku/remove_debug_lxpc
6bee178 
remove debug output from LXPC
@hone
update changelog
3aa57f8
@hone
v79
90afa59
@juno
Merge branch 'master' into run-bower-develop
b361d74 
Conflicts:
	lib/language_pack/ruby.rb
@juno
Update bower to 1.2.6
5bb11d6
juno added a commit that referenced this pull request Sep 4, 2013
@juno
Merge pull request #10 from qnyp/run-bower-develop
b93b3fb 
Merge upstream and update bower 1.2.6
@juno juno merged commit b93b3fb into run-bower Sep 4, 2013
@juno juno deleted the run-bower-develop branch September 4, 2013 03:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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.
7 participants
@juno @schneems @hone @jkrall @gabrielg @wuputah @mikehale