Merge branch 'release-v2.5.0' into stable
Showing
- Gemfile 4 additions, 0 deletionsGemfile
- app/controllers/users_controller.rb 20 additions, 2 deletionsapp/controllers/users_controller.rb
- app/helpers/application_helper.rb 1 addition, 1 deletionapp/helpers/application_helper.rb
- app/helpers/users_helper.rb 16 additions, 3 deletionsapp/helpers/users_helper.rb
- app/models/journal.rb 1 addition, 1 deletionapp/models/journal.rb
- app/models/mailer.rb 2 additions, 2 deletionsapp/models/mailer.rb
- app/models/user.rb 24 additions, 0 deletionsapp/models/user.rb
- app/models/wiki_content.rb 6 additions, 1 deletionapp/models/wiki_content.rb
- app/views/issues/_edit.rhtml 2 additions, 2 deletionsapp/views/issues/_edit.rhtml
- app/views/layouts/base.rhtml 1 addition, 1 deletionapp/views/layouts/base.rhtml
- app/views/projects/index.rhtml 3 additions, 0 deletionsapp/views/projects/index.rhtml
- app/views/queries/_filters.rhtml 3 additions, 3 deletionsapp/views/queries/_filters.rhtml
- config/locales/bg.yml 20 additions, 20 deletionsconfig/locales/bg.yml
- config/preinitializer.rb 4 additions, 4 deletionsconfig/preinitializer.rb
- config/routes.rb 1 addition, 2 deletionsconfig/routes.rb
- doc/CHANGELOG.rdoc 14 additions, 211199 deletionsdoc/CHANGELOG.rdoc
- extra/svn/Redmine.pm 23 additions, 21 deletionsextra/svn/Redmine.pm
- lib/chili_project/compatibility.rb 14 additions, 0 deletionslib/chili_project/compatibility.rb
- lib/chili_project/version.rb 1 addition, 1 deletionlib/chili_project/version.rb
- lib/redmine.rb 3 additions, 3 deletionslib/redmine.rb
Please register or sign in to comment