[DRE-commits] [redmine] 01/03: Merge tag 'upstream/2.4.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 7021e3727dd3751e65f254dcc0afd74f179f6f50
Merge: 6ef9c3d 2309683
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Jan 28 11:21:47 2014 +0100

    Merge tag 'upstream/2.4.2'
    
    Upstream version 2.4.2
    
    # gpg: Signature made Tue 28 Jan 2014 11:21:47 AM CET 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                                            |   2 +-
 app/controllers/account_controller.rb              |   8 +
 app/controllers/repositories_controller.rb         |   2 +-
 app/controllers/timelog_controller.rb              |   2 +-
 app/helpers/application_helper.rb                  |   5 +-
 app/helpers/issues_helper.rb                       |   4 +-
 app/models/issue.rb                                |  23 +-
 app/models/mail_handler.rb                         |   5 +
 app/models/time_entry_query.rb                     |  15 +-
 app/views/search/index.html.erb                    |   4 +-
 config/application.rb                              |   2 +
 config/locales/es.yml                              |  10 +-
 config/locales/ja.yml                              |   4 +-
 config/locales/ru.yml                              |  15 +-
 config/locales/tr.yml                              | 305 ++++++++++-----------
 doc/CHANGELOG                                      |  16 ++
 lib/redmine/scm/adapters.rb                        |  25 ++
 lib/redmine/scm/adapters/abstract_adapter.rb       |   3 -
 lib/redmine/scm/adapters/bazaar_adapter.rb         |   2 +-
 lib/redmine/version.rb                             |   2 +-
 public/help/ar/wiki_syntax_detailed.html           |   8 +-
 public/help/az/wiki_syntax_detailed.html           |   8 +-
 public/help/bg/wiki_syntax_detailed.html           |   8 +-
 public/help/bs/wiki_syntax_detailed.html           |   8 +-
 public/help/ca/wiki_syntax_detailed.html           |   8 +-
 public/help/cs/wiki_syntax_detailed.html           |   8 +-
 public/help/da/wiki_syntax_detailed.html           |   8 +-
 public/help/de/wiki_syntax_detailed.html           |   8 +-
 public/help/el/wiki_syntax_detailed.html           |   8 +-
 public/help/en-gb/wiki_syntax_detailed.html        |   8 +-
 public/help/en/wiki_syntax_detailed.html           |   8 +-
 public/help/es/wiki_syntax_detailed.html           |   8 +-
 public/help/et/wiki_syntax_detailed.html           |   8 +-
 public/help/eu/wiki_syntax_detailed.html           |   8 +-
 public/help/fa/wiki_syntax_detailed.html           |   8 +-
 public/help/fi/wiki_syntax_detailed.html           |   8 +-
 public/help/fr/wiki_syntax_detailed.html           |   8 +-
 public/help/gl/wiki_syntax_detailed.html           |   8 +-
 public/help/he/wiki_syntax_detailed.html           |   8 +-
 public/help/hr/wiki_syntax_detailed.html           |   8 +-
 public/help/hu/wiki_syntax_detailed.html           |   8 +-
 public/help/id/wiki_syntax_detailed.html           |   8 +-
 public/help/it/wiki_syntax_detailed.html           |   8 +-
 public/help/ja/wiki_syntax_detailed.html           |   8 +-
 public/help/ko/wiki_syntax_detailed.html           |   8 +-
 public/help/lt/wiki_syntax_detailed.html           |   8 +-
 public/help/lv/wiki_syntax_detailed.html           |   8 +-
 public/help/mk/wiki_syntax_detailed.html           |   8 +-
 public/help/mn/wiki_syntax_detailed.html           |   8 +-
 public/help/nl/wiki_syntax_detailed.html           |   8 +-
 public/help/no/wiki_syntax_detailed.html           |   8 +-
 public/help/pl/wiki_syntax_detailed.html           |   8 +-
 public/help/pt-br/wiki_syntax_detailed.html        |   8 +-
 public/help/pt/wiki_syntax_detailed.html           |   8 +-
 public/help/ro/wiki_syntax_detailed.html           |   8 +-
 public/help/ru/wiki_syntax.html                    | 185 ++++++++++---
 public/help/ru/wiki_syntax_detailed.html           | 232 +++++++++-------
 public/help/sk/wiki_syntax_detailed.html           |   8 +-
 public/help/sl/wiki_syntax_detailed.html           |   8 +-
 public/help/sq/wiki_syntax_detailed.html           |   8 +-
 public/help/sr-yu/wiki_syntax_detailed.html        |   8 +-
 public/help/sr/wiki_syntax_detailed.html           |   8 +-
 public/help/sv/wiki_syntax_detailed.html           |   8 +-
 public/help/th/wiki_syntax_detailed.html           |   8 +-
 public/help/tr/wiki_syntax_detailed.html           |   8 +-
 public/help/uk/wiki_syntax_detailed.html           |   8 +-
 public/help/vi/wiki_syntax_detailed.html           |   8 +-
 public/help/zh-tw/wiki_syntax_detailed.html        |   8 +-
 public/help/zh/wiki_syntax_detailed.html           |   8 +-
 public/stylesheets/application.css                 |   2 +-
 test/fixtures/mail_handler/multiple_text_parts.eml |   7 +
 test/functional/account_controller_openid_test.rb  |  10 +
 test/functional/issues_controller_test.rb          |   2 +-
 .../repositories_subversion_controller_test.rb     |   4 +-
 test/functional/users_controller_test.rb           |   6 -
 test/unit/issue_test.rb                            |  13 +
 test/unit/mail_handler_test.rb                     |  10 +-
 test/unit/mailer_test.rb                           |  10 +
 test/unit/time_entry_query_test.rb                 |  40 +++
 79 files changed, 831 insertions(+), 520 deletions(-)

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