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: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 665fee622969
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3863f230bf6e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 19, 2014

  1. Add jruby-head to travis targets

    @elia
    elia committed Nov 19, 2014
    Copy the full SHA
    5cbf12c View commit details

  2. Make the Opal::Environment warning more visible

    @elia
    elia committed Nov 19, 2014
    Copy the full SHA
    3863f23 View commit details
Showing with 5 additions and 1 deletion.
  1. +4 −0 .travis.yml
  2. +1 −1 lib/opal/sprockets/environment.rb
4 changes: 4 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -25,12 +25,16 @@ matrix:
- rvm: jruby
env: RUN=rspec

- rvm: jruby-head
env: RUN=rspec

allow_failures:
- rvm: 1.8.7
- rvm: 1.9.3
- rvm: 2.0.0
- rvm: rbx
- rvm: jruby
- rvm: jruby-head


before_install:
2 changes: 1 addition & 1 deletion lib/opal/sprockets/environment.rb
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ def self.process asset
# do this for you.
class Environment < ::Sprockets::Environment
def initialize *args
warn "Opal::Sprockets::Environment is deprecated. "\
warn "WARNING: Opal::Sprockets::Environment is deprecated. "\
"Please use Opal::Server directly or append Opal.paths to the environment manually."
super
append_opal_paths