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 7, 2015
1 parent a3b80a4 commit 5b48fe9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
18 changes: 13 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
GIT
remote: git://github.com/rack/rack.git
revision: c617ea99c12a5bfe026e00476ff37e714e01891a
revision: e836fad64ba3a79f8169ef44aa97b7004fca5e86
specs:
rack (2.0.0.alpha)
json

GIT
remote: git://github.com/rails/arel.git
revision: 77ec13b46af2926bfcfc3073685711c874b0d272
revision: 3c429c5d86e9e2201c2a35d934ca6a8911c18e69
specs:
arel (7.0.0.alpha)

Expand Down Expand Up @@ -40,22 +40,22 @@ GIT

GIT
remote: git://github.com/rails/sprockets.git
revision: d2ec0c6effed9f0cafb9c2b3c92e829998c01b74
revision: 2d30e546872f6f4c5361fe19c2d89b15c5db2dd4
specs:
sprockets (4.0.0)
rack (>= 1, < 3)

GIT
remote: git://github.com/rails/turbolinks.git
revision: eac0a3e43a69b341abdd55ef1bc45d1d4cfaf8a9
revision: 01ec4087302496868e72e0ae3f16376f13fc1499
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 @@ -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)
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 5b48fe9

Please sign in to comment.