diff options
| author | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-10-20 14:39:33 +0200 |
| commit | b97daaed9b513006ace7e8eb5232a2211e965e77 (patch) | |
| tree | e27002e8368e92410e5d4af2a945260c2ea6e2d1 /engines/support/config | |
| parent | c6c4d9fd10b8ca8e24889112727e44c9bf68dd60 (diff) | |
| parent | 6eb2dae802e5453e2a4361ab28f614cce9294f4c (diff) | |
Merge remote-tracking branch 'origin/develop'
We'll only use the master branch for development from now on.
Diffstat (limited to 'engines/support/config')
| -rw-r--r-- | engines/support/config/initializers/account_lifecycle.rb | 2 | ||||
| -rw-r--r-- | engines/support/config/locales/en.yml | 2 | ||||
| -rw-r--r-- | engines/support/config/routes.rb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/engines/support/config/initializers/account_lifecycle.rb b/engines/support/config/initializers/account_lifecycle.rb index d9f04c1..9060757 100644 --- a/engines/support/config/initializers/account_lifecycle.rb +++ b/engines/support/config/initializers/account_lifecycle.rb @@ -1,3 +1,5 @@ +require 'account_extension/tickets' + ActiveSupport.on_load(:account) do include AccountExtension::Tickets end diff --git a/engines/support/config/locales/en.yml b/engines/support/config/locales/en.yml index 83af2c4..3b509d5 100644 --- a/engines/support/config/locales/en.yml +++ b/engines/support/config/locales/en.yml @@ -92,7 +92,7 @@ en: # mouse over hints for the given fields hints: ticket: - email: "Provide an email address in order to notified when this ticket is updated." + email: "Provide an email address in order to be notified when this ticket is updated." # these will fallback to translations in "simple_form.hints.defaults" # placeholders inside the fields before anything was typed #placeholders: diff --git a/engines/support/config/routes.rb b/engines/support/config/routes.rb index 81bdf9a..5647477 100644 --- a/engines/support/config/routes.rb +++ b/engines/support/config/routes.rb @@ -3,8 +3,8 @@ Rails.application.routes.draw do resources :tickets, except: :edit do member do - put 'open' - put 'close' + patch 'open' + patch 'close' end end |