Update Ember.js, Handlebars and jQuery to latest
This commit is contained in:
parent
a8011a5b63
commit
73cc722ed5
4
Gemfile
4
Gemfile
|
@ -88,8 +88,8 @@ gem 'active_model_serializers'
|
|||
gem 'onebox'
|
||||
|
||||
gem 'ember-rails'
|
||||
gem 'ember-source', '~> 1.2.0.1'
|
||||
gem 'handlebars-source', '~> 1.1.2'
|
||||
gem 'ember-source', '1.6.0.beta.2'
|
||||
gem 'handlebars-source', '1.3.0'
|
||||
gem 'barber'
|
||||
|
||||
gem 'message_bus'
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -80,8 +80,8 @@ GEM
|
|||
handlebars-source
|
||||
jquery-rails (>= 1.0.17)
|
||||
railties (>= 3.1)
|
||||
ember-source (1.2.0.1)
|
||||
handlebars-source (~> 1.1.2)
|
||||
ember-source (1.6.0.beta.2)
|
||||
handlebars-source (~> 1.0)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
excon (0.28.0)
|
||||
|
@ -123,7 +123,7 @@ GEM
|
|||
given_core (3.5.4)
|
||||
sorcerer (>= 0.3.7)
|
||||
guess_html_encoding (0.0.9)
|
||||
handlebars-source (1.1.2)
|
||||
handlebars-source (1.3.0)
|
||||
hashie (2.0.5)
|
||||
hexpress (1.2.0)
|
||||
highline (1.6.20)
|
||||
|
@ -400,7 +400,7 @@ DEPENDENCIES
|
|||
discourse_plugin!
|
||||
email_reply_parser-discourse
|
||||
ember-rails
|
||||
ember-source (~> 1.2.0.1)
|
||||
ember-source (= 1.6.0.beta.2)
|
||||
eventmachine
|
||||
fabrication
|
||||
fakeweb (~> 1.3.0)
|
||||
|
@ -412,7 +412,7 @@ DEPENDENCIES
|
|||
fog (= 1.18.0)
|
||||
foreman
|
||||
gctools
|
||||
handlebars-source (~> 1.1.2)
|
||||
handlebars-source (= 1.3.0)
|
||||
highline
|
||||
hiredis
|
||||
image_optim (= 0.9.1)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<%
|
||||
if Rails.env.development? || Rails.env.test?
|
||||
require_asset ("development/jquery-2.0.3.js")
|
||||
require_asset ("development/jquery-2.1.0.js")
|
||||
else
|
||||
require_asset ("production/jquery-2.0.3.min.js")
|
||||
require_asset ("production/jquery-2.1.0.min.js")
|
||||
end
|
||||
%>
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
//= require ../../app/assets/javascripts/discourse/lib/probes.js
|
||||
|
||||
// Externals we need to load first
|
||||
//= require development/jquery-2.0.3.js
|
||||
//= require development/jquery-2.1.0.js
|
||||
//= require jquery.ui.widget.js
|
||||
//= require handlebars.js
|
||||
//= require development/ember.js
|
||||
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue