[DRE-commits] [redmine] 01/03: Merge tag 'upstream/3.3.3'
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Aug 11 17:20:32 UTC 2017
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit c436ef8aaf0e4dc972a7b56c6f50cd86963b2bbd
Merge: 027e842 feed4b8
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Apr 10 12:21:46 2017 -0300
Merge tag 'upstream/3.3.3'
Upstream version 3.3.3
# gpg: Signature made seg 10 abr 2017 12:21:43 -03
# gpg: using RSA key B2DEE66036C40829FCD0F10CFC0DB1BBCD460BDE
# gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at dcc.ufba.br>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at colivre.coop.br>" [ultimate]
# gpg: aka "Antonio Terceiro <terceiro at debian.org>" [ultimate]
# gpg: aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]
Gemfile | 15 ++--
app/controllers/account_controller.rb | 12 +++-
app/controllers/attachments_controller.rb | 2 +-
app/controllers/context_menus_controller.rb | 7 +-
app/controllers/issues_controller.rb | 22 ++++--
app/controllers/members_controller.rb | 2 +-
app/controllers/repositories_controller.rb | 2 +-
app/controllers/timelog_controller.rb | 19 +++--
app/controllers/users_controller.rb | 2 +-
app/helpers/application_helper.rb | 2 +-
app/models/attachment.rb | 4 +-
app/models/custom_field.rb | 1 +
app/models/group_builtin.rb | 4 +-
app/models/issue.rb | 15 +++-
app/models/issue_query.rb | 8 +--
app/models/project.rb | 29 +++++++-
app/models/query.rb | 9 +++
app/models/repository.rb | 2 +
app/models/role.rb | 4 +-
app/models/time_entry.rb | 6 +-
app/models/time_entry_query.rb | 8 ---
app/models/user.rb | 5 +-
app/models/version.rb | 2 +-
app/models/wiki.rb | 1 +
app/models/wiki_page.rb | 1 +
app/views/issues/_form.html.erb | 2 +-
app/views/issues/destroy.html.erb | 2 +
app/views/issues/show.html.erb | 2 +-
app/views/layouts/base.html.erb | 2 +-
app/views/projects/settings/_members.html.erb | 2 +-
app/views/timelog/report.html.erb | 2 +-
config/application.rb | 2 +-
config/locales/ar.yml | 2 +
config/locales/az.yml | 2 +
config/locales/bg.yml | 4 +-
config/locales/bs.yml | 2 +
config/locales/ca.yml | 46 ++++++------
config/locales/cs.yml | 14 ++--
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 | 1 +
config/locales/es-PA.yml | 46 ++++++------
config/locales/es.yml | 46 ++++++------
config/locales/et.yml | 2 +
config/locales/eu.yml | 2 +
config/locales/fa.yml | 2 +
config/locales/fi.yml | 2 +
config/locales/fr.yml | 1 +
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 | 4 +-
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 | 65 +++++++++--------
config/locales/ro.yml | 2 +
config/locales/ru.yml | 4 +-
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 | 2 +
config/locales/uk.yml | 2 +
config/locales/vi.yml | 2 +
config/locales/zh-TW.yml | 1 +
config/locales/zh.yml | 2 +
doc/CHANGELOG | 53 +++++++++++++-
extra/svn/Redmine.pm | 5 +-
.../acts_as_attachable/lib/acts_as_attachable.rb | 1 -
.../acts_as_versioned/lib/acts_as_versioned.rb | 7 +-
lib/redcloth3.rb | 14 +++-
lib/redmine/nested_set/traversing.rb | 2 +-
lib/redmine/scm/adapters/git_adapter.rb | 3 +
.../scm/adapters/mercurial/redminehelper.py | 81 +++++++++++-----------
lib/redmine/syntax_highlighting.rb | 16 +++++
lib/redmine/thumbnail.rb | 5 +-
lib/redmine/version.rb | 2 +-
lib/redmine/wiki_formatting/macros.rb | 4 +-
lib/redmine/wiki_formatting/markdown/formatter.rb | 2 +-
lib/redmine/wiki_formatting/textile/formatter.rb | 10 ++-
public/javascripts/application.js | 1 +
public/stylesheets/application.css | 6 +-
public/stylesheets/responsive.css | 8 ++-
.../redmine_pm/repository_subversion_test_pm.rb | 25 ++++++-
test/fixtures/attachments.yml | 1 +
test/fixtures/wikis.yml | 5 ++
test/functional/account_controller_test.rb | 13 +++-
test/functional/issues_controller_test.rb | 74 +++++++++++++++++++-
test/functional/members_controller_test.rb | 18 +++++
.../project_enumerations_controller_test.rb | 2 +-
test/functional/projects_controller_test.rb | 12 ++++
test/functional/timelog_controller_test.rb | 9 +++
test/functional/users_controller_test.rb | 2 +-
test/integration/account_test.rb | 3 +
test/integration/admin_test.rb | 2 +-
test/integration/api_test/attachments_test.rb | 19 +++++
test/integration/api_test/issues_test.rb | 50 ++++++++++++-
test/integration/api_test/memberships_test.rb | 34 +++++----
test/integration/api_test/time_entries_test.rb | 11 +++
test/integration/attachments_test.rb | 12 ++++
test/test_helper.rb | 2 +-
test/ui/custom_fields_test_ui.rb | 38 ----------
test/unit/auth_source_ldap_test.rb | 6 +-
test/unit/changeset_test.rb | 2 +-
test/unit/custom_field_test.rb | 4 +-
test/unit/custom_field_user_format_test.rb | 6 +-
test/unit/custom_field_version_format_test.rb | 6 +-
test/unit/group_test.rb | 2 +-
test/unit/helpers/application_helper_test.rb | 19 +++--
test/unit/issue_test.rb | 4 +-
test/unit/journal_test.rb | 2 +-
test/unit/lib/redmine/codeset_util_test.rb | 2 +-
test/unit/lib/redmine/export/pdf_test.rb | 4 +-
test/unit/lib/redmine/i18n_test.rb | 7 +-
test/unit/lib/redmine/menu_manager/mapper_test.rb | 2 +-
test/unit/lib/redmine/mime_type_test.rb | 21 ++++--
.../lib/redmine/scm/adapters/git_adapter_test.rb | 6 +-
.../redmine/scm/adapters/mercurial_adapter_test.rb | 6 +-
.../wiki_formatting/markdown_formatter_test.rb | 9 +++
.../wiki_formatting/textile_formatter_test.rb | 54 ++++++++++++++-
test/unit/project_test.rb | 16 ++++-
test/unit/query_test.rb | 16 ++++-
test/unit/repository_git_test.rb | 2 +-
test/unit/tracker_test.rb | 2 +-
test/unit/user_test.rb | 6 +-
test/unit/version_test.rb | 4 +-
test/unit/wiki_page_test.rb | 2 +-
142 files changed, 909 insertions(+), 359 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/redmine.git
More information about the Pkg-ruby-extras-commits
mailing list