Skip to content

Commit 9d65f87

Browse files
committed
Update ember, ember-data, ember-rails & handlebars
1 parent bd89527 commit 9d65f87

File tree

4 files changed

+18329
-16028
lines changed

4 files changed

+18329
-16028
lines changed

Gemfile.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
GIT
22
remote: git://github.com/emberjs/ember-rails.git
3-
revision: dea9f5c093e255c26e4dbaf55a35b345f01323b5
3+
revision: c0455c33d5ca9ead1ba62c8ebb3e665aa7ca0198
44
specs:
5-
ember-rails (0.11.1)
5+
ember-rails (0.12.0)
66
active_model_serializers
77
barber (>= 0.4.1)
88
ember-data-source
9-
ember-source
9+
ember-source (>= 1.0.0.rc2.2)
1010
execjs (>= 1.2)
1111
railties (>= 3.1)
1212

1313
GIT
1414
remote: git://github.com/rails-api/active_model_serializers.git
15-
revision: 1c285772805546ee5c076c8693811e2a7206af29
15+
revision: 329a38a7ddee4350f96d657256a5f6a277865291
1616
specs:
17-
active_model_serializers (0.5.2)
17+
active_model_serializers (0.7.0)
1818
activemodel (>= 3.0)
1919

2020
GEM
@@ -52,7 +52,7 @@ GEM
5252
sass (>= 3.2)
5353
ansi (1.4.3)
5454
arel (3.0.2)
55-
barber (0.4.1)
55+
barber (0.4.2)
5656
ember-source
5757
execjs
5858
handlebars-source
@@ -69,7 +69,7 @@ GEM
6969
colorize (0.5.8)
7070
ember-data-source (0.0.5)
7171
ember-source
72-
ember-source (0.0.1)
72+
ember-source (1.0.0.rc3.2)
7373
handlebars-source (>= 1.0.0.rc3, < 1.0.0.rc4)
7474
erubis (2.7.0)
7575
eventmachine (1.0.1)
@@ -78,8 +78,8 @@ GEM
7878
faye-websocket (0.4.7)
7979
eventmachine (>= 0.12.0)
8080
ffi (1.4.0)
81-
handlebars-source (1.0.0.rc.3)
82-
hike (1.2.1)
81+
handlebars-source (1.0.0.rc3)
82+
hike (1.2.2)
8383
http_parser.rb (0.5.3)
8484
i18n (0.6.4)
8585
journey (1.0.4)
@@ -113,7 +113,7 @@ GEM
113113
minitest-capybara (~> 0.1)
114114
minitest-matchers (>= 1.2)
115115
minitest-rails (~> 0.5)
116-
multi_json (1.6.1)
116+
multi_json (1.7.2)
117117
nokogiri (1.5.6)
118118
poltergeist (1.1.0)
119119
capybara (~> 2.0, >= 2.0.1)
@@ -142,7 +142,7 @@ GEM
142142
rake (>= 0.8.7)
143143
rdoc (~> 3.4)
144144
thor (>= 0.14.6, < 2.0)
145-
rake (10.0.3)
145+
rake (10.0.4)
146146
rdoc (3.12.2)
147147
json (~> 1.4)
148148
ref (1.0.2)
@@ -170,8 +170,8 @@ GEM
170170
therubyracer (0.11.4)
171171
libv8 (~> 3.11.8.12)
172172
ref
173-
thor (0.17.0)
174-
tilt (1.3.4)
173+
thor (0.18.1)
174+
tilt (1.3.7)
175175
treetop (1.4.12)
176176
polyglot
177177
polyglot (>= 0.3.1)

0 commit comments

Comments
 (0)