diff options
| author | Azul <azul@leap.se> | 2013-02-08 10:41:03 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-02-08 10:41:03 +0100 |
| commit | be9da142f83b630422643b2483356d2263ecc155 (patch) | |
| tree | e1d9c1a92c2d760d90bc0506b007dcb3272ed765 | |
| parent | 6cad874bc9788553aecb5e0b5d75719185966077 (diff) | |
| parent | 2d8b7b5ea52e73516315d365c51867005b893c0b (diff) | |
Merge remote-tracking branch 'origin/master' into feature/use-couchrest-session-store
| -rw-r--r-- | help/app/assets/javascripts/tickets.js | 1 | ||||
| -rw-r--r-- | ui_dependencies.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/help/app/assets/javascripts/tickets.js b/help/app/assets/javascripts/tickets.js index 8f58e86..5376a6e 100644 --- a/help/app/assets/javascripts/tickets.js +++ b/help/app/assets/javascripts/tickets.js @@ -1,3 +1,4 @@ $(document).ready(function () { + $.fn.editable.defaults.mode = 'inline'; $('#title').editable(); });
\ No newline at end of file diff --git a/ui_dependencies.rb b/ui_dependencies.rb index c0779c0..2eb1e77 100644 --- a/ui_dependencies.rb +++ b/ui_dependencies.rb @@ -5,7 +5,7 @@ gem "simple_form" gem 'client_side_validations' gem 'client_side_validations-simple_form' gem 'kaminari', "0.13.0" # for pagination. trying 0.13.0 as there seem to be issues with 0.14.0 when using couchrest -gem 'bootstrap-editable-rails' +gem 'bootstrap-editable-rails', "~>0.0.4" group :assets do gem "haml-rails", "~> 0.3.4" |