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-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8b0da63116c2
Choose a base ref
...
head repository: opal/opal-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0eb26e8c6e9a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Sep 5, 2013

  1. Copy the full SHA
    2c8f3b7 View commit details
  2. Copy the full SHA
    61fb312 View commit details
  3. Whitespace

    elia committed Sep 5, 2013
    Copy the full SHA
    0eb26e8 View commit details
Showing with 5 additions and 3 deletions.
  1. +1 −1 Gemfile
  2. +1 −0 lib/opal/rails.rb
  3. +3 −2 opal-rails.gemspec
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ gemspec
gem 'capybara-webkit' unless ENV['CI']
# gem 'opal', :github => 'opal/opal'
# gem 'opal-jquery', :github => 'opal/opal-jquery'
gem 'opal-spec', :github => 'opal/opal-spec'
# gem 'opal-spec', :github => 'opal/opal-spec'

if RUBY_VERSION.to_f == 1.8
gem 'nokogiri', '< 1.6'
1 change: 1 addition & 0 deletions lib/opal/rails.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
require 'opal'
require 'opal-jquery'
require 'opal-activesupport'
require 'opal-spec'

require 'opal/rails/engine'
5 changes: 3 additions & 2 deletions opal-rails.gemspec
Original file line number Diff line number Diff line change
@@ -23,8 +23,9 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'opal-sprockets', '~> 0.2.0'

s.add_runtime_dependency 'rails', '>= 3.2.13', '< 5.0'
s.add_runtime_dependency 'opal-jquery', '>= 0.0.8'
s.add_runtime_dependency 'opal-spec', '~> 0.3.1'
s.add_runtime_dependency 'opal-jquery', '>= 0.0.8'
s.add_runtime_dependency 'opal-spec', '~> 0.3.1'
s.add_runtime_dependency 'opal-activesupport'
s.add_runtime_dependency 'jquery-rails'

s.add_development_dependency 'rspec', '~> 2.13'