[DRE-commits] [redmine] 31/39: Merge tag 'upstream/3.1.1'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository redmine.

commit fd61d20f2bb54054c20a1f1f89f9b4b439385965
Merge: 125d55c 2363275
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Oct 5 17:29:52 2015 -0300

    Merge tag 'upstream/3.1.1'
    
    Upstream version 3.1.1
    
    # gpg: Signature made Seg 05 Out 2015 17:29:48 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"

 .travis.yml                                       |  62 ++++++
 Gemfile                                           |   4 +-
 app/controllers/application_controller.rb         |  34 ++-
 app/controllers/queries_controller.rb             |   1 +
 app/helpers/application_helper.rb                 |   2 +-
 app/helpers/custom_fields_helper.rb               |   3 +-
 app/models/attachment.rb                          |   2 +-
 app/models/issue.rb                               |  20 +-
 app/models/issue_query.rb                         |  18 +-
 app/models/mail_handler.rb                        |   2 +
 app/models/project.rb                             |   2 +-
 app/models/user.rb                                |   3 +-
 app/views/issues/show.html.erb                    |   2 +-
 app/views/layouts/mailer.html.erb                 |  23 --
 app/views/mailer/_issue.html.erb                  |   2 +-
 app/views/mailer/issue_add.html.erb               |   2 +-
 app/views/mailer/issue_edit.html.erb              |   4 +-
 config/locales/ar.yml                             |   2 +
 config/locales/az.yml                             |   2 +
 config/locales/bg.yml                             |   2 +
 config/locales/bs.yml                             |   2 +
 config/locales/ca.yml                             |   2 +
 config/locales/cs.yml                             |  81 +++----
 config/locales/da.yml                             |   2 +
 config/locales/de.yml                             |   2 +
 config/locales/el.yml                             |   2 +
 config/locales/en-GB.yml                          |   2 +
 config/locales/en.yml                             |   2 +
 config/locales/es-PA.yml                          |   2 +
 config/locales/es.yml                             |   2 +
 config/locales/et.yml                             |   2 +
 config/locales/eu.yml                             |   2 +
 config/locales/fa.yml                             |   2 +
 config/locales/fi.yml                             |   2 +
 config/locales/fr.yml                             |   2 +
 config/locales/gl.yml                             |   2 +
 config/locales/he.yml                             |   2 +
 config/locales/hr.yml                             |   2 +
 config/locales/hu.yml                             |   2 +
 config/locales/id.yml                             |   2 +
 config/locales/it.yml                             |   2 +
 config/locales/ja.yml                             |  10 +-
 config/locales/ko.yml                             |   2 +
 config/locales/lt.yml                             |   2 +
 config/locales/lv.yml                             |   2 +
 config/locales/mk.yml                             |   2 +
 config/locales/mn.yml                             |   2 +
 config/locales/nl.yml                             |   2 +
 config/locales/no.yml                             |   2 +
 config/locales/pl.yml                             |   2 +
 config/locales/pt-BR.yml                          |   2 +
 config/locales/pt.yml                             |  97 ++++-----
 config/locales/ro.yml                             |   2 +
 config/locales/ru.yml                             |   2 +
 config/locales/sk.yml                             |   2 +
 config/locales/sl.yml                             |   2 +
 config/locales/sq.yml                             |   2 +
 config/locales/sr-YU.yml                          |   2 +
 config/locales/sr.yml                             |   2 +
 config/locales/sv.yml                             |   2 +
 config/locales/th.yml                             |   2 +
 config/locales/tr.yml                             | 108 +++++-----
 config/locales/uk.yml                             |   2 +
 config/locales/vi.yml                             |   2 +
 config/locales/zh-TW.yml                          |   2 +
 config/locales/zh.yml                             |   2 +
 doc/CHANGELOG                                     |  31 +++
 lib/redmine/info.rb                               |   4 +-
 lib/redmine/version.rb                            |   2 +-
 lib/tasks/ci.rake                                 |   2 +-
 public/help/cs/wiki_syntax_detailed_markdown.html | 252 +++++++++++-----------
 public/help/cs/wiki_syntax_detailed_textile.html  |  24 +--
 public/help/cs/wiki_syntax_markdown.html          |  52 ++---
 public/help/cs/wiki_syntax_textile.html           |   8 +-
 public/javascripts/raphael.js                     |  10 -
 public/stylesheets/application.css                |   4 +-
 public/stylesheets/scm.css                        |   4 +-
 test/functional/account_controller_test.rb        |  12 +-
 test/functional/issues_controller_test.rb         |  26 +++
 test/functional/queries_controller_test.rb        |  16 ++
 test/unit/attachment_test.rb                      |   7 +
 test/unit/project_test.rb                         |  15 +-
 82 files changed, 655 insertions(+), 386 deletions(-)

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