[DRE-commits] [redmine] 05/10: Merge tag 'upstream/3.2.3'

[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 4020bb4788a32cb23493adf595c52fcf4007ccfe
Merge: ba226b9 75e1f98
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jun 5 14:08:16 2016 -0300

    Merge tag 'upstream/3.2.3'
    
    Upstream version 3.2.3

 Gemfile                                            |   3 +-
 app/helpers/application_helper.rb                  |   1 +
 app/models/custom_field.rb                         |   8 ++
 app/models/import.rb                               |   2 +-
 app/models/issue.rb                                |  11 +-
 app/models/query.rb                                |   2 +-
 app/views/activities/index.html.erb                |   1 +
 app/views/imports/show.html.erb                    |   2 +-
 app/views/issues/_list.html.erb                    |   2 +-
 app/views/issues/bulk_edit.html.erb                |   8 ++
 app/views/issues/index.html.erb                    |   2 +-
 app/views/projects/show.html.erb                   |   2 +-
 app/views/repositories/_revisions.html.erb         |   2 +
 app/views/workflows/permissions.html.erb           |   2 +-
 config/locales/de.yml                              |   2 +-
 config/locales/ko.yml                              | 143 +++++++++----------
 config/locales/pt-BR.yml                           | 158 ++++++++++-----------
 doc/CHANGELOG                                      |  30 ++++
 .../lib/acts_as_customizable.rb                    |   8 ++
 lib/redcloth3.rb                                   |   5 +-
 lib/redmine/field_format.rb                        |  19 ++-
 lib/redmine/helpers/url.rb                         |  35 +++++
 lib/redmine/thumbnail.rb                           |   5 +
 lib/redmine/version.rb                             |   2 +-
 lib/redmine/wiki_formatting/markdown/formatter.rb  |   9 ++
 public/javascripts/application.js                  |   1 +
 public/javascripts/responsive.js                   |   6 +-
 public/javascripts/revision_graph.js               |  16 ++-
 public/stylesheets/application.css                 |   2 +-
 public/stylesheets/responsive.css                  |  13 ++
 test/functional/issues_controller_test.rb          |  43 ++++++
 test/functional/workflows_controller_test.rb       |   3 +
 test/integration/api_test/groups_test.rb           |   2 +-
 test/unit/helpers/application_helper_test.rb       |   4 +-
 .../field_format/enumeration_format_test.rb        |   4 +
 .../lib/redmine/field_format/field_format_test.rb  |  15 ++
 36 files changed, 393 insertions(+), 180 deletions(-)

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