[DRE-commits] [redmine] 01/03: Merge tag 'upstream/2.5.2'

[Ondrej Sury]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository redmine.

commit 239ac77c1681f77c5c78c953696c3200314788e6
Merge: 1386a01 2f74ed2
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 12:39:24 2014 +0200

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2
    
    # gpg: Signature made 2014-07-16T12:39:24 CEST using RSA key ID F4FCBB07
    # gpg: Good signature from "Ondřej Surý <ondrej at sury.org>"
    # gpg:                 aka "Ondřej Surý <ondrej at debian.org>"
    # gpg:                 aka "[jpeg image of size 3934]"

 Gemfile                                            |  4 +-
 app/controllers/admin_controller.rb                |  2 +-
 app/controllers/application_controller.rb          | 46 +++++++++++-----
 app/controllers/context_menus_controller.rb        |  2 +-
 app/helpers/admin_helper.rb                        |  8 +++
 app/helpers/application_helper.rb                  |  3 +-
 app/helpers/custom_fields_helper.rb                |  8 ++-
 app/models/issue.rb                                |  5 ++
 app/models/mail_handler.rb                         |  1 +
 app/models/mailer.rb                               |  2 +-
 app/models/member.rb                               | 12 +++++
 app/models/repository.rb                           |  2 +-
 app/views/admin/plugins.html.erb                   | 46 +++++++++++++++-
 app/views/attachments/_form.html.erb               |  4 +-
 app/views/common/_tabs.html.erb                    |  4 +-
 app/views/custom_fields/formats/_bool.html.erb     |  2 +-
 app/views/custom_fields/index.api.rsb              |  4 +-
 app/views/queries/_form.html.erb                   | 14 +++--
 config/configuration.yml.example                   |  5 +-
 config/environments/production.rb                  |  3 +-
 config/initializers/10-patches.rb                  | 24 +++++++++
 config/locales/ar.yml                              |  4 ++
 config/locales/az.yml                              |  4 ++
 config/locales/bg.yml                              |  4 ++
 config/locales/bs.yml                              |  4 ++
 config/locales/ca.yml                              |  4 ++
 config/locales/cs.yml                              |  4 ++
 config/locales/da.yml                              |  4 ++
 config/locales/de.yml                              |  6 ++-
 config/locales/el.yml                              |  4 ++
 config/locales/en-GB.yml                           |  4 ++
 config/locales/en.yml                              |  4 ++
 config/locales/es.yml                              |  4 ++
 config/locales/et.yml                              |  4 ++
 config/locales/eu.yml                              |  4 ++
 config/locales/fa.yml                              |  4 ++
 config/locales/fi.yml                              |  4 ++
 config/locales/fr.yml                              |  6 ++-
 config/locales/gl.yml                              |  4 ++
 config/locales/he.yml                              |  4 ++
 config/locales/hr.yml                              |  4 ++
 config/locales/hu.yml                              |  4 ++
 config/locales/id.yml                              |  4 ++
 config/locales/it.yml                              |  4 ++
 config/locales/ja.yml                              |  4 ++
 config/locales/ko.yml                              |  4 ++
 config/locales/lt.yml                              |  4 ++
 config/locales/lv.yml                              |  4 ++
 config/locales/mk.yml                              |  4 ++
 config/locales/mn.yml                              |  4 ++
 config/locales/nl.yml                              |  4 ++
 config/locales/no.yml                              |  4 ++
 config/locales/pl.yml                              |  4 ++
 config/locales/pt-BR.yml                           |  4 ++
 config/locales/pt.yml                              |  4 ++
 config/locales/ro.yml                              |  4 ++
 config/locales/ru.yml                              |  4 ++
 config/locales/sk.yml                              |  4 ++
 config/locales/sl.yml                              |  4 ++
 config/locales/sq.yml                              |  4 ++
 config/locales/sr-YU.yml                           |  4 ++
 config/locales/sr.yml                              |  4 ++
 config/locales/sv.yml                              |  4 ++
 config/locales/th.yml                              |  4 ++
 config/locales/tr.yml                              |  4 ++
 config/locales/uk.yml                              |  4 ++
 config/locales/vi.yml                              |  4 ++
 config/locales/zh-TW.yml                           |  8 ++-
 config/locales/zh.yml                              |  4 ++
 doc/CHANGELOG                                      | 28 ++++++++++
 .../acts_as_attachable/lib/acts_as_attachable.rb   |  2 +-
 lib/redmine/field_format.rb                        | 27 +++++++++-
 lib/redmine/helpers/time_report.rb                 |  2 +-
 lib/redmine/mime_type.rb                           |  2 +-
 lib/redmine/version.rb                             |  2 +-
 lib/redmine/wiki_formatting/macros.rb              |  7 ++-
 lib/redmine/wiki_formatting/markdown/formatter.rb  |  5 +-
 public/404.html                                    |  2 +-
 public/500.html                                    |  2 +-
 public/javascripts/attachments.js                  |  4 +-
 test/functional/account_controller_test.rb         | 46 +++++++++++++++-
 test/functional/context_menus_controller_test.rb   | 12 +++++
 .../time_entry_reports_controller_test.rb          | 14 ++++-
 test/integration/api_test/custom_fields_test.rb    |  2 +
 test/unit/attachment_test.rb                       |  9 ++++
 test/unit/helpers/application_helper_test.rb       |  8 +++
 test/unit/initializers/patches_test.rb             | 61 +++++++++++++++++++++
 test/unit/issue_test.rb                            | 10 ++++
 .../lib/redmine/field_format/bool_format_test.rb   | 63 ++++++++++++++++++++++
 .../lib/redmine/field_format/list_format_test.rb   | 12 +++++
 .../field_format/version_field_format_test.rb      |  7 +++
 .../lib/redmine/wiki_formatting/macros_test.rb     | 12 ++---
 .../redmine/wiki_formatting/markdown_formatter.rb  | 16 ++++++
 test/unit/mail_handler_test.rb                     | 36 ++++++++-----
 test/unit/mailer_test.rb                           |  6 +++
 test/unit/member_test.rb                           | 17 ++++++
 96 files changed, 738 insertions(+), 77 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git