Skip to content

Commit

Permalink
Updated bundle (problem with execjs seems to be fixed)
Browse files Browse the repository at this point in the history
  • Loading branch information
mischa78 committed Sep 28, 2013
1 parent 97f2c03 commit e3e1d74
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ gem 'sass-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
gem 'jquery-rails'
gem 'execjs', '1.4.0'

# App specific gems
gem 'dynamic_form'
Expand Down
18 changes: 8 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ GEM
acts_as_tree (1.4.0)
activerecord (>= 3.0.0)
arel (4.0.0)
atomic (1.1.13)
atomic (1.1.14)
builder (3.1.4)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.1)
cocaine (0.5.2)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.0.0)
coffee-script (>= 2.2.0)
Expand All @@ -43,8 +43,7 @@ GEM
coffee-script-source (1.6.3)
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
execjs (2.0.2)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
Expand All @@ -61,9 +60,9 @@ GEM
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.24)
mime-types (1.25)
minitest (4.7.5)
multi_json (1.7.9)
multi_json (1.8.0)
paperclip (3.5.1)
activemodel (>= 3.0.0)
activesupport (>= 3.0.0)
Expand All @@ -87,7 +86,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
sass (3.2.10)
sass (3.2.11)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
Expand All @@ -103,14 +102,14 @@ GEM
sprockets (~> 2.8)
sqlite3 (1.3.8)
thor (0.18.1)
thread_safe (0.1.2)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.37)
uglifier (2.2.0)
uglifier (2.2.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)

Expand All @@ -121,7 +120,6 @@ DEPENDENCIES
acts_as_tree
coffee-rails (~> 4.0.0)
dynamic_form
execjs (= 1.4.0)
factory_girl_rails
jquery-fileupload-rails
jquery-rails
Expand Down

0 comments on commit e3e1d74

Please sign in to comment.