Merge branch 'master' into unstable
Conflicts: doc/CHANGELOG.rdoc
No related branches found
No related tags found
Showing
- app/controllers/account_controller.rb 1 addition, 1 deletionapp/controllers/account_controller.rb
- app/controllers/application_controller.rb 1 addition, 0 deletionsapp/controllers/application_controller.rb
- app/controllers/custom_fields_controller.rb 4 additions, 2 deletionsapp/controllers/custom_fields_controller.rb
- app/controllers/enumerations_controller.rb 2 additions, 0 deletionsapp/controllers/enumerations_controller.rb
- app/controllers/issue_categories_controller.rb 2 additions, 0 deletionsapp/controllers/issue_categories_controller.rb
- app/controllers/roles_controller.rb 5 additions, 3 deletionsapp/controllers/roles_controller.rb
- app/controllers/settings_controller.rb 11 additions, 10 deletionsapp/controllers/settings_controller.rb
- doc/CHANGELOG.rdoc 6 additions, 0 deletionsdoc/CHANGELOG.rdoc
- lib/redmine/version.rb 1 addition, 1 deletionlib/redmine/version.rb
- public/404.html 2 additions, 2 deletionspublic/404.html
- public/500.html 5 additions, 3 deletionspublic/500.html
- test/functional/roles_controller_test.rb 1 addition, 1 deletiontest/functional/roles_controller_test.rb
- test/integration/account_test.rb 25 additions, 1 deletiontest/integration/account_test.rb
Loading
Please register or sign in to comment