diff options
| author | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-14 11:50:54 -0800 |
| commit | c2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch) | |
| tree | 5b7a11e9aed58357d2a38b248b965cd936de6888 /help/app/views/tickets | |
| parent | d81bf00ecd8bdfcddf50e4881428c917253326fe (diff) | |
| parent | ee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff) | |
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts:
users/test/functional/users_controller_test.rb
Diffstat (limited to 'help/app/views/tickets')
| -rw-r--r-- | help/app/views/tickets/_ticket_data.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/help/app/views/tickets/_ticket_data.html.haml b/help/app/views/tickets/_ticket_data.html.haml index 3d301be..fee080f 100644 --- a/help/app/views/tickets/_ticket_data.html.haml +++ b/help/app/views/tickets/_ticket_data.html.haml @@ -22,4 +22,4 @@ = button_to 'Close', {:post => {:is_open => false}}, :method => :put, :class => 'btn btn-small' - else = 'closed' - = button_to 'Open', {:post => {:is_open => true}}, :method => :put, :class => 'btn btn-small'
\ No newline at end of file + = button_to 'Open', {:post => {:is_open => true}}, :method => :put, :class => 'btn btn-small' |