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 /help/app/controllers | |
| 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 'help/app/controllers')
| -rw-r--r-- | help/app/controllers/tickets_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/help/app/controllers/tickets_controller.rb b/help/app/controllers/tickets_controller.rb index 4d6caef..3ff19b8 100644 --- a/help/app/controllers/tickets_controller.rb +++ b/help/app/controllers/tickets_controller.rb @@ -110,6 +110,7 @@ class TicketsController < ApplicationController @post_reply_str = 'Post reply' #t :post_reply @reply_close_str = 'Reply and close' #t :reply_and_close end + # not using now, as we are using comment_attributes= from the Ticket model =begin def add_comment |