Merge remote-tracking branch 'chiliproject/master' into unstable
Showing
- app/controllers/account_controller.rb 3 additions, 3 deletionsapp/controllers/account_controller.rb
- app/controllers/wiki_controller.rb 1 addition, 0 deletionsapp/controllers/wiki_controller.rb
- app/models/auth_source_ldap.rb 32 additions, 3 deletionsapp/models/auth_source_ldap.rb
- app/views/ldap_auth_sources/_form.rhtml 3 additions, 0 deletionsapp/views/ldap_auth_sources/_form.rhtml
- app/views/wiki/annotate.rhtml 9 additions, 2 deletionsapp/views/wiki/annotate.rhtml
- config/locales/en.yml 1 addition, 0 deletionsconfig/locales/en.yml
- db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb 9 additions, 0 deletions...grate/20100217010520_add_custom_filter_to_auth_sources.rb
- public/htaccess.fcgi.example 55 additions, 55 deletionspublic/htaccess.fcgi.example
- test/fixtures/ldap/slapd_config.ldif 27 additions, 0 deletionstest/fixtures/ldap/slapd_config.ldif
- test/fixtures/ldap/test-ldap.ldif 0 additions, 42 deletionstest/fixtures/ldap/test-ldap.ldif
- test/functional/account_controller_test.rb 11 additions, 0 deletionstest/functional/account_controller_test.rb
- test/unit/auth_source_ldap_test.rb 40 additions, 0 deletionstest/unit/auth_source_ldap_test.rb
Please register or sign in to comment