Skip to content

Commit 1c1e116

Browse files
committed
updates es6-rails dependency to 0.3.5
1 parent 5dec01d commit 1c1e116

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ gem 'jbuilder', '~> 2.0'
2121
# bundle exec rake doc:rails generates the API under doc/api.
2222
gem 'sdoc', '~> 0.4.0', group: :doc
2323

24+
gem 'es6-rails', '0.3.5'
2425
# gem 'es6-rails' , path: "../es6-rails"
25-
gem 'es6-rails', :git => "[email protected]:razorcd/es6-rails.git", :branch => "es6_js_extension_for_assets_and_views"
26+
# gem 'es6-rails', :git => "[email protected]:razorcd/es6-rails.git", :branch => "master"
2627

2728
# Use ActiveModel has_secure_password
2829
# gem 'bcrypt', '~> 3.1.7'

Gemfile.lock

+16-20
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
PATH
2-
remote: ../es6-rails
3-
specs:
4-
es6-rails (0.3.1)
5-
babel-transpiler (~> 0.7, >= 0.7.0)
6-
rails (>= 4.0, < 5.0)
7-
sprockets (~> 3.0, >= 3.0.0)
8-
sprockets-es6 (~> 0.8, >= 0.8.1)
9-
101
GEM
112
remote: https://rubygems.org/
123
specs:
@@ -73,11 +64,16 @@ GEM
7364
coffee-script-source
7465
execjs
7566
coffee-script-source (1.12.2)
76-
concurrent-ruby (1.1.3)
67+
concurrent-ruby (1.1.4)
7768
crass (1.0.4)
7869
debug_inspector (0.0.3)
7970
diff-lcs (1.3)
8071
erubis (2.7.0)
72+
es6-rails (0.3.5)
73+
babel-transpiler (~> 0.7, >= 0.7.0)
74+
rails (>= 4.0, < 5.0)
75+
sprockets (~> 3.0, >= 3.0.0)
76+
sprockets-es6 (~> 0.8, >= 0.8.1)
8177
execjs (2.7.0)
8278
ffi (1.9.25)
8379
globalid (0.4.1)
@@ -101,11 +97,11 @@ GEM
10197
mime-types-data (~> 3.2015)
10298
mime-types-data (3.2018.0812)
10399
mini_mime (1.0.1)
104-
mini_portile2 (2.3.0)
100+
mini_portile2 (2.4.0)
105101
minitest (5.11.3)
106102
multi_json (1.13.1)
107-
nokogiri (1.8.5)
108-
mini_portile2 (~> 2.3.0)
103+
nokogiri (1.9.1)
104+
mini_portile2 (~> 2.4.0)
109105
public_suffix (3.0.3)
110106
rack (1.6.11)
111107
rack-test (0.6.3)
@@ -134,10 +130,10 @@ GEM
134130
activesupport (= 4.2.4)
135131
rake (>= 0.8.7)
136132
thor (>= 0.18.1, < 2.0)
137-
rake (12.3.1)
133+
rake (12.3.2)
138134
rb-fsevent (0.10.3)
139-
rb-inotify (0.9.10)
140-
ffi (>= 0.5.0, < 2)
135+
rb-inotify (0.10.0)
136+
ffi (~> 1.0)
141137
rdoc (4.3.0)
142138
rspec-core (3.4.4)
143139
rspec-support (~> 3.4.0)
@@ -186,10 +182,10 @@ GEM
186182
sqlite3 (1.3.13)
187183
thor (0.20.3)
188184
thread_safe (0.3.6)
189-
tilt (2.0.8)
185+
tilt (2.0.9)
190186
tzinfo (1.2.5)
191187
thread_safe (~> 0.1)
192-
uglifier (4.1.19)
188+
uglifier (4.1.20)
193189
execjs (>= 0.3.0, < 3)
194190
web-console (2.3.0)
195191
activemodel (>= 4.0)
@@ -206,7 +202,7 @@ DEPENDENCIES
206202
byebug
207203
capybara-webkit (~> 1.11.1)
208204
coffee-rails (~> 4.1.0)
209-
es6-rails!
205+
es6-rails (= 0.3.5)
210206
jbuilder (~> 2.0)
211207
jquery-rails
212208
rails (= 4.2.4)
@@ -219,4 +215,4 @@ DEPENDENCIES
219215
web-console (~> 2.0)
220216

221217
BUNDLED WITH
222-
1.17.1
218+
1.16.6

0 commit comments

Comments
 (0)