Skip to content
This repository was archived by the owner on Oct 19, 2018. It is now read-only.

Commit 263aec9

Browse files
committed
Merge branch '1_0_0' into edge
2 parents d1cca4f + 35c26ce commit 263aec9

File tree

4 files changed

+2
-4
lines changed

4 files changed

+2
-4
lines changed

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
source 'https://rubygems.org'
22
gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
3-
gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
43
gemspec

gemfiles/opal_0_11_react-rails_2_4.gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ source "https://rubygems.org"
22
source ENV['HYPER_DEV_GEM_SOURCE'] if ENV['HYPER_DEV_GEM_SOURCE']
33

44
gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
5-
gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
65

76
gemspec :path => "../"

hyper-spec.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
4141
spec.add_development_dependency 'hyper-react', HyperSpec::VERSION
4242
spec.add_development_dependency 'mini_racer', '~> 0.1.15'
4343
spec.add_development_dependency 'opal-browser', '~> 0.2.0'
44-
spec.add_development_dependency 'opal-rails', '~> 0.9.3'
44+
spec.add_development_dependency 'opal-rails', '~> 0.9.4'
4545
spec.add_development_dependency 'puma'
4646
spec.add_development_dependency 'rails', '>= 4.0.0'
4747
spec.add_development_dependency 'rake'

spec/test_app/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ gem 'react-rails', '>= 2.4.0', '< 2.5.0'
4949
gem 'hyper-react', HyperSpec::VERSION #, path: '../../../hyper-react'
5050
gem 'hyper-store', HyperSpec::VERSION #, path: '../../../hyper-store'
5151
gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
52-
gem "opal-rails", git: "https://github.com/opal/opal-rails.git", branch: "master"
52+
gem "opal-rails", '~> 0.9.4'
5353
gem 'parser'
5454
gem 'opal-browser'
5555
gem 'timecop', '~> 0.8.1'

0 commit comments

Comments
 (0)