diff options
| author | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-11-26 10:15:22 -0800 |
| commit | 3e744e4e226eae3ea2f900d9fccc32b6c046d65f (patch) | |
| tree | 1b19232d08229b178c094c92e2242ce1686099ae /config | |
| parent | d9d67bd60d3fdfa4106977de9e5aba11f659fc79 (diff) | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
Merge branch 'develop' into help_develop
Conflicts:
users/app/views/sessions/_nav.html.haml
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.yml | 8 | ||||
| -rw-r--r-- | config/initializers/client_side_validations.rb | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/config.yml b/config/config.yml new file mode 100644 index 0000000..c34dd10 --- /dev/null +++ b/config/config.yml @@ -0,0 +1,8 @@ +development: + admins: [admin, admin2] + +test: + admins: [admin, admin2] + +production: + admins: [] diff --git a/config/initializers/client_side_validations.rb b/config/initializers/client_side_validations.rb index 2c73fa3..252aded 100644 --- a/config/initializers/client_side_validations.rb +++ b/config/initializers/client_side_validations.rb @@ -1,7 +1,7 @@ # ClientSideValidations Initializer # Uncomment to disable uniqueness validator, possible security issue -# ClientSideValidations::Config.disabled_validators = [:uniqueness] +ClientSideValidations::Config.disabled_validators = [:uniqueness] # Uncomment the following block if you want each input field to have the validation messages attached. ActionView::Base.field_error_proc = Proc.new do |html_tag, instance| |