diff options
| author | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-07 10:31:12 -0800 |
| commit | e1a004e2b24c2c235452469abfefa033e24435b2 (patch) | |
| tree | a4b1c89a5aa4d5ccb3c17521499c999dedd5842d /ui_dependencies.rb | |
| parent | 4793c2b770fcb018303b7ab226b75cc218364327 (diff) | |
| parent | 8282b83c798ba4e5c1e26ec8243b82669b3ee6d4 (diff) | |
Merge branch 'master' into help_develop
Conflicts:
app/views/layouts/application.html.haml
help/app/controllers/tickets_controller.rb
help/test/functional/tickets_controller_test.rb
users/test/support/stub_record_helper.rb
Diffstat (limited to 'ui_dependencies.rb')
| -rw-r--r-- | ui_dependencies.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui_dependencies.rb b/ui_dependencies.rb index 30d6706..eed79a3 100644 --- a/ui_dependencies.rb +++ b/ui_dependencies.rb @@ -14,7 +14,7 @@ group :assets do gem "uglifier", "~> 1.2.7" # See https://github.com/sstephenson/execjs#readme for more supported runtimes - gem 'therubyracer', :platforms => :ruby + gem 'therubyracer', "~> 0.10.2", :platforms => :ruby end |