From 7346fcc00db376a96de13a0c4c71f0777ebb18c8 Mon Sep 17 00:00:00 2001
From: Eric Guo <eric@cloud-mes.com>
Date: Wed, 7 Oct 2015 00:14:02 +0800
Subject: [PATCH] Refresh cloud-mes change, add modeler assets.

bootstrap-sass need below patch.
https://github.com/twbs/bootstrap-sass/pull/965
---
 Gemfile.lock                                  | 16 ++++++++++++----
 vendor/assets/javascripts/mes/modeler/all.js  |  1 +
 vendor/assets/stylesheets/mes/modeler/all.css |  3 +++
 3 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 vendor/assets/javascripts/mes/modeler/all.js
 create mode 100644 vendor/assets/stylesheets/mes/modeler/all.css

diff --git a/Gemfile.lock b/Gemfile.lock
index a5e8682..0a24d1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rack/rack.git
-  revision: c617ea99c12a5bfe026e00476ff37e714e01891a
+  revision: e836fad64ba3a79f8169ef44aa97b7004fca5e86
   specs:
     rack (2.0.0.alpha)
       json
@@ -40,14 +40,14 @@ GIT
 
 GIT
   remote: git://github.com/rails/sprockets.git
-  revision: d2ec0c6effed9f0cafb9c2b3c92e829998c01b74
+  revision: edae5cdfa241b0fb0fcb756b25cd561c3d8b7f29
   specs:
     sprockets (4.0.0)
       rack (>= 1, < 3)
 
 GIT
   remote: git://github.com/rails/turbolinks.git
-  revision: eac0a3e43a69b341abdd55ef1bc45d1d4cfaf8a9
+  revision: 4bb563cd777875d3ad73cf007c26334f2aa8dc37
   branch: master
   specs:
     turbolinks (3.0.0)
@@ -55,7 +55,7 @@ GIT
 
 GIT
   remote: git://github.com/rails/web-console.git
-  revision: 72f14664dfbeeb1fe65d34acdec36bd94a95a4d5
+  revision: ca5fa48aa410d40788b1eaeb11941adf3b4e4a08
   specs:
     web-console (3.0.0)
       activemodel (>= 4.0)
@@ -142,10 +142,18 @@ PATH
   remote: ../cloud-mes/modeler
   specs:
     mes-modeler (0.0.1)
+      bootstrap-sass (~> 3.3.5)
+      jquery-rails (~> 4.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    autoprefixer-rails (6.0.3)
+      execjs
+      json
+    bootstrap-sass (3.3.5.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.3.0)
     builder (3.2.2)
     byebug (6.0.2)
     coffee-script (2.4.1)
diff --git a/vendor/assets/javascripts/mes/modeler/all.js b/vendor/assets/javascripts/mes/modeler/all.js
new file mode 100644
index 0000000..4c10b9b
--- /dev/null
+++ b/vendor/assets/javascripts/mes/modeler/all.js
@@ -0,0 +1 @@
+//= require mes/modeler
diff --git a/vendor/assets/stylesheets/mes/modeler/all.css b/vendor/assets/stylesheets/mes/modeler/all.css
new file mode 100644
index 0000000..e59a299
--- /dev/null
+++ b/vendor/assets/stylesheets/mes/modeler/all.css
@@ -0,0 +1,3 @@
+/*
+ *= require mes/modeler
+ */