Skip to content

Commit

Permalink
Refresh cloud-mes change, add modeler assets.
Browse files Browse the repository at this point in the history
bootstrap-sass need below patch.
twbs/bootstrap-sass#965
  • Loading branch information
Eric-Guo committed Oct 10, 2015
1 parent a3b80a4 commit 3ec53cd
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 8 deletions.
28 changes: 20 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/rack/rack.git
revision: c617ea99c12a5bfe026e00476ff37e714e01891a
revision: e836fad64ba3a79f8169ef44aa97b7004fca5e86
specs:
rack (2.0.0.alpha)
json
Expand Down Expand Up @@ -40,22 +40,22 @@ 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)
coffee-rails

GIT
remote: git://github.com/rails/web-console.git
revision: 72f14664dfbeeb1fe65d34acdec36bd94a95a4d5
revision: ca5fa48aa410d40788b1eaeb11941adf3b4e4a08
specs:
web-console (3.0.0)
activemodel (>= 4.0)
Expand Down Expand Up @@ -137,22 +137,32 @@ PATH
remote: ../cloud-mes/core
specs:
mes-core (0.0.1)
pundit (~> 1.0.1)

PATH
remote: ../cloud-mes/modeler
specs:
mes-modeler (0.0.1)
bootstrap-sass (~> 3.3.5)
jquery-rails (~> 4.0.5)
pundit (~> 1.0.1)

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)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
concurrent-ruby (1.0.0.pre3)
concurrent-ruby (1.0.0.pre4)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.6.0)
Expand Down Expand Up @@ -180,6 +190,8 @@ GEM
mini_portile (~> 0.7.0.rc4)
nokogiri (1.6.7.rc3-x86-mingw32)
mini_portile (~> 0.7.0.rc4)
pundit (1.0.1)
activesupport (>= 3.0.0)
rack-test (0.6.3)
rack (>= 1.0)
rails-deprecated_sanitizer (1.0.3)
Expand All @@ -191,9 +203,9 @@ GEM
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rake (10.4.2)
sass (3.4.18)
sqlite3 (1.3.10)
sqlite3 (1.3.10-x86-mingw32)
sass (3.4.19)
sqlite3 (1.3.11)
sqlite3 (1.3.11-x86-mingw32)
thor (0.19.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
Expand Down
1 change: 1 addition & 0 deletions vendor/assets/javascripts/mes/modeler/all.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
//= require mes/modeler
3 changes: 3 additions & 0 deletions vendor/assets/stylesheets/mes/modeler/all.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/*
*= require mes/modeler
*/

0 comments on commit 3ec53cd

Please sign in to comment.