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: 86398d6d3b54
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: afb51ad3c105
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 12, 2014

  1. Allow Sprockets 2.12.2 through 3.x

    @josh
    josh committed Oct 12, 2014
    Copy the full SHA
    260347d View commit details

Commits on Oct 13, 2014

  1. Merge pull request #620 from josh/sprockets-3 

    Sprockets 3.x
    @elia
    elia committed Oct 13, 2014
    Copy the full SHA
    afb51ad View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 Gemfile
  2. +1 −1 opal.gemspec
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ gem 'thin', platform: :mri

# Uncomment to try with sprockets 3.0:
#
# gem 'sprockets', github: 'sstephenson/sprockets', branch: 'master'
# gem 'sprockets', '~> 3.0.0.beta'

group :repl do
gem 'therubyracer', :platform => :mri, :require => 'v8'
2 changes: 1 addition & 1 deletion opal.gemspec
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
required_ruby_version = '>= 1.9.3'

s.add_dependency 'sourcemap', '~> 0.1.0'
s.add_dependency 'sprockets', '~> 2.12.1'
s.add_dependency 'sprockets', '>= 2.12.1', '< 4.0.0'
s.add_dependency 'hike', '~> 1.2'
s.add_dependency 'tilt', '~> 1.4'