[DRE-commits] [redmine] 02/26: Merge tag 'upstream/3.0_20140825'
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Sep 14 17:54:45 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository redmine.
commit a0cdadbd00dcafcbf78f0ffd6927bcac66b89ff8
Merge: c51d4c5 45b5122
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Aug 25 21:03:21 2014 -0300
Merge tag 'upstream/3.0_20140825'
Upstream version 3.0~20140825
# gpg: Signature made Seg 25 Ago 2014 21:03:05 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.run-test.sh | 3 +
.travis.yml | 8 +-
Gemfile | 45 +-
app/controllers/admin_controller.rb | 2 +-
app/controllers/application_controller.rb | 2 +-
app/controllers/attachments_controller.rb | 6 +-
app/controllers/auto_completes_controller.rb | 2 +-
app/controllers/boards_controller.rb | 9 +-
app/controllers/documents_controller.rb | 6 +-
app/controllers/enumerations_controller.rb | 6 +-
app/controllers/files_controller.rb | 6 +-
app/controllers/groups_controller.rb | 17 +-
app/controllers/issue_categories_controller.rb | 2 +-
app/controllers/issue_statuses_controller.rb | 2 +-
app/controllers/issues_controller.rb | 21 +-
app/controllers/journals_controller.rb | 1 -
app/controllers/members_controller.rb | 7 +-
app/controllers/messages_controller.rb | 4 +-
app/controllers/my_controller.rb | 4 +-
app/controllers/news_controller.rb | 2 +-
app/controllers/project_enumerations_controller.rb | 2 +-
app/controllers/projects_controller.rb | 26 +-
app/controllers/queries_controller.rb | 3 +-
app/controllers/reports_controller.rb | 2 +-
app/controllers/repositories_controller.rb | 8 +-
app/controllers/roles_controller.rb | 10 +-
app/controllers/search_controller.rb | 2 +-
app/controllers/sys_controller.rb | 5 +-
app/controllers/timelog_controller.rb | 10 +-
app/controllers/trackers_controller.rb | 6 +-
app/controllers/users_controller.rb | 8 +-
app/controllers/versions_controller.rb | 8 +-
app/controllers/watchers_controller.rb | 4 +-
app/controllers/wiki_controller.rb | 6 +-
app/controllers/workflows_controller.rb | 107 +-
app/helpers/application_helper.rb | 28 +-
app/helpers/groups_helper.rb | 2 +-
app/helpers/issues_helper.rb | 6 +-
app/helpers/members_helper.rb | 2 +-
app/helpers/my_helper.rb | 21 +-
app/helpers/projects_helper.rb | 16 +-
app/helpers/queries_helper.rb | 34 +-
app/helpers/settings_helper.rb | 24 +-
app/helpers/sort_helper.rb | 3 +-
app/helpers/timelog_helper.rb | 2 +-
app/helpers/workflows_helper.rb | 62 +-
app/models/attachment.rb | 15 +-
app/models/auth_source.rb | 1 +
app/models/auth_source_ldap.rb | 4 -
app/models/board.rb | 9 +-
app/models/change.rb | 1 +
app/models/changeset.rb | 9 +-
app/models/comment.rb | 1 +
app/models/custom_field.rb | 5 +-
app/models/custom_value.rb | 1 +
app/models/document.rb | 10 +-
app/models/enabled_module.rb | 1 +
app/models/enumeration.rb | 12 +-
app/models/group.rb | 4 +-
app/models/issue.rb | 140 +--
app/models/issue_category.rb | 1 +
app/models/issue_custom_field.rb | 2 +-
app/models/issue_query.rb | 34 +-
app/models/issue_status.rb | 3 +-
app/models/journal.rb | 26 +-
app/models/journal_detail.rb | 1 +
app/models/mail_handler.rb | 17 +-
app/models/member.rb | 3 +-
app/models/member_role.rb | 1 +
app/models/message.rb | 9 +-
app/models/news.rb | 14 +-
app/models/principal.rb | 18 +-
app/models/project.rb | 71 +-
app/models/query.rb | 49 +-
app/models/repository.rb | 16 +-
app/models/repository/cvs.rb | 10 +-
app/models/repository/git.rb | 2 +-
app/models/repository/mercurial.rb | 7 +-
app/models/repository/subversion.rb | 2 +-
app/models/role.rb | 2 +-
app/models/setting.rb | 2 +
app/models/time_entry.rb | 14 +-
app/models/time_entry_query.rb | 5 +-
app/models/token.rb | 1 +
app/models/tracker.rb | 4 +-
app/models/user.rb | 25 +-
app/models/version.rb | 7 +-
app/models/watcher.rb | 1 +
app/models/wiki.rb | 3 +-
app/models/wiki_content.rb | 19 +-
app/models/wiki_page.rb | 13 +-
app/models/wiki_redirect.rb | 1 +
app/models/workflow_permission.rb | 43 +-
app/models/workflow_rule.rb | 3 +-
app/models/workflow_transition.rb | 71 +-
app/views/groups/_memberships.html.erb | 2 +-
app/views/groups/index.html.erb | 5 +-
app/views/issues/bulk_edit.html.erb | 2 +-
app/views/journals/new.js.erb | 2 +-
app/views/layouts/base.html.erb | 2 +-
app/views/projects/_form.html.erb | 2 +-
app/views/projects/settings/_members.html.erb | 2 +-
app/views/repositories/_revisions.html.erb | 4 +-
app/views/search/index.html.erb | 4 +-
app/views/timelog/_form.html.erb | 6 +-
app/views/users/_memberships.html.erb | 2 +-
app/views/wiki/destroy.html.erb | 2 +-
app/views/wiki/edit.html.erb | 2 +-
app/views/wiki/history.html.erb | 2 +-
app/views/wiki/rename.html.erb | 2 +-
app/views/workflows/_form.html.erb | 5 +-
app/views/workflows/edit.html.erb | 33 +-
app/views/workflows/permissions.html.erb | 37 +-
{script => bin}/about | 0
bin/bundle | 3 +
bin/rails | 4 +
bin/rake | 4 +
config/application.rb | 9 +-
config/boot.rb | 2 -
config/database.yml.example | 3 +-
config/environment.rb | 6 +-
config/environments/development.rb | 18 +-
config/environments/production.rb | 34 +-
config/environments/test.rb | 17 +-
config/environments/test_pgsql.rb | 1 +
config/environments/test_sqlite3.rb | 1 +
config/initializers/10-patches.rb | 72 +-
config/initializers/30-redmine.rb | 2 +
config/locales/ar.yml | 1 +
config/locales/az.yml | 1 +
config/locales/bg.yml | 1 +
config/locales/bs.yml | 1 +
config/locales/ca.yml | 1 +
config/locales/cs.yml | 1 +
config/locales/da.yml | 1 +
config/locales/de.yml | 1 +
config/locales/el.yml | 1 +
config/locales/en-GB.yml | 1 +
config/locales/en.yml | 1 +
config/locales/es.yml | 1 +
config/locales/et.yml | 1 +
config/locales/eu.yml | 1 +
config/locales/fa.yml | 632 ++++++------
config/locales/fi.yml | 1 +
config/locales/fr.yml | 181 ++--
config/locales/gl.yml | 1 +
config/locales/he.yml | 1 +
config/locales/hr.yml | 1 +
config/locales/hu.yml | 1 +
config/locales/id.yml | 1 +
config/locales/it.yml | 1 +
config/locales/ja.yml | 45 +-
config/locales/ko.yml | 1 +
config/locales/lt.yml | 1 +
config/locales/lv.yml | 1 +
config/locales/mk.yml | 1 +
config/locales/mn.yml | 1 +
config/locales/nl.yml | 1 +
config/locales/no.yml | 1 +
config/locales/pl.yml | 1 +
config/locales/pt-BR.yml | 1 +
config/locales/pt.yml | 1 +
config/locales/ro.yml | 1 +
config/locales/ru.yml | 1 +
config/locales/sk.yml | 1 +
config/locales/sl.yml | 1 +
config/locales/sq.yml | 1 +
config/locales/sr-YU.yml | 1 +
config/locales/sr.yml | 1 +
config/locales/sv.yml | 1 +
config/locales/th.yml | 1 +
config/locales/tr.yml | 1 +
config/locales/uk.yml | 1 +
config/locales/vi.yml | 1 +
config/locales/zh-TW.yml | 29 +-
config/locales/zh.yml | 1 +
config/preinitializer.rb | 20 -
config/routes.rb | 16 +-
db/migrate/001_setup.rb | 5 +-
...calendar_and_gantt_modules_where_appropriate.rb | 2 +-
doc/CHANGELOG | 14 +-
doc/INSTALL | 5 +-
.../lib/acts_as_activity_provider.rb | 6 +-
.../acts_as_attachable/lib/acts_as_attachable.rb | 5 +-
.../lib/acts_as_customizable.rb | 7 +-
lib/plugins/acts_as_event/lib/acts_as_event.rb | 2 +-
.../acts_as_searchable/lib/acts_as_searchable.rb | 15 +-
.../acts_as_tree/lib/active_record/acts/tree.rb | 2 +-
.../acts_as_watchable/lib/acts_as_watchable.rb | 2 +-
lib/redcloth3.rb | 2 +-
lib/redmine.rb | 7 +-
lib/redmine/access_control.rb | 4 +-
lib/redmine/codeset_util.rb | 147 +--
lib/redmine/configuration.rb | 5 +-
lib/redmine/core_ext/active_record.rb | 25 -
lib/redmine/core_ext/string/conversions.rb | 7 -
lib/redmine/export/pdf.rb | 34 +-
lib/redmine/field_format.rb | 3 +-
lib/redmine/helpers/gantt.rb | 4 +-
lib/redmine/hook.rb | 4 +-
lib/redmine/i18n.rb | 2 +-
lib/redmine/imap.rb | 2 +-
lib/redmine/menu_manager.rb | 2 +-
lib/redmine/notifiable.rb | 1 +
lib/redmine/plugin.rb | 8 +-
lib/redmine/pop3.rb | 16 +-
lib/redmine/scm/adapters/abstract_adapter.rb | 27 +-
lib/redmine/scm/adapters/bazaar_adapter.rb | 7 +-
lib/redmine/scm/adapters/cvs_adapter.rb | 7 +-
lib/redmine/scm/adapters/darcs_adapter.rb | 5 +-
lib/redmine/scm/adapters/git_adapter.rb | 10 +-
lib/redmine/scm/adapters/mercurial_adapter.rb | 22 +-
lib/redmine/scm/adapters/subversion_adapter.rb | 25 +-
lib/redmine/unified_diff.rb | 20 +-
lib/redmine/version.rb | 2 +-
lib/redmine/views/labelled_form_builder.rb | 16 +-
lib/redmine/wiki_formatting.rb | 14 +-
lib/tasks/ci.rake | 6 +-
lib/tasks/ciphering.rake | 4 +-
lib/tasks/email.rake | 14 +-
lib/tasks/locales.rake | 3 -
lib/tasks/migrate_from_mantis.rake | 8 +-
lib/tasks/migrate_from_trac.rake | 15 +-
lib/tasks/redmine.rake | 3 +-
lib/tasks/testing.rake | 16 +-
public/javascripts/application.js | 20 +-
public/javascripts/context_menu.js | 10 +-
public/javascripts/gantt.js | 4 +-
.../jquery-1.11.1-ui-1.11.0-ujs-3.1.1.js | 21 +
.../javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js | 11 -
public/stylesheets/application.css | 8 +-
.../stylesheets/jquery/images/animated-overlay.gif | Bin 0 -> 1738 bytes
.../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 260 -> 418 bytes
.../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 251 -> 312 bytes
.../jquery/images/ui-bg_flat_10_000000_40x100.png | Bin 178 -> 205 bytes
.../jquery/images/ui-bg_glass_100_eef5fd_1x400.png | Bin 113 -> 345 bytes
.../jquery/images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 104 -> 262 bytes
.../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 207 bytes
.../images/ui-bg_gloss-wave_35_759fcf_500x100.png | Bin 3945 -> 5772 bytes
.../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 90 -> 278 bytes
.../ui-bg_highlight-soft_75_759fcf_1x100.png | Bin 126 -> 343 bytes
.../jquery/images/ui-icons_222222_256x240.png | Bin 4369 -> 6922 bytes
.../jquery/images/ui-icons_759fcf_256x240.png | Bin 4369 -> 4549 bytes
.../jquery/images/ui-icons_ffd27a_256x240.png | Bin 4369 -> 4549 bytes
.../jquery/images/ui-icons_ffffff_256x240.png | Bin 4369 -> 6299 bytes
public/stylesheets/jquery/jquery-ui-1.11.0.css | 7 +
public/stylesheets/jquery/jquery-ui-1.9.2.css | 5 -
script/about | 6 +-
script/rails | 6 +-
test/fixtures/mail_handler/gmail-iso8859-2.eml | 11 +
.../mail_handler/quoted_printable_utf8.eml | 19 +
test/functional/account_controller_test.rb | 12 +-
test/functional/activities_controller_test.rb | 12 +-
test/functional/admin_controller_test.rb | 3 +-
test/functional/attachments_controller_test.rb | 30 +-
test/functional/calendars_controller_test.rb | 15 +-
test/functional/context_menus_controller_test.rb | 14 +-
test/functional/custom_fields_controller_test.rb | 2 +-
test/functional/groups_controller_test.rb | 8 +-
test/functional/issues_controller_test.rb | 55 +-
.../issues_custom_fields_visibility_test.rb | 4 +-
test/functional/members_controller_test.rb | 2 +-
test/functional/messages_controller_test.rb | 4 +-
test/functional/my_controller_test.rb | 2 +-
.../repositories_bazaar_controller_test.rb | 54 +-
.../functional/repositories_cvs_controller_test.rb | 2 +-
.../repositories_filesystem_controller_test.rb | 12 +-
.../functional/repositories_git_controller_test.rb | 45 +-
.../repositories_mercurial_controller_test.rb | 21 +-
test/functional/roles_controller_test.rb | 4 +-
test/functional/search_controller_test.rb | 5 +-
test/functional/settings_controller_test.rb | 12 +-
.../time_entry_reports_controller_test.rb | 51 +-
test/functional/timelog_controller_test.rb | 18 +-
.../timelog_custom_fields_visibility_test.rb | 8 +-
test/functional/welcome_controller_test.rb | 4 +-
test/functional/wiki_controller_test.rb | 8 +-
test/functional/workflows_controller_test.rb | 138 +--
test/integration/account_test.rb | 9 +-
test/integration/admin_test.rb | 2 +-
test/integration/api_test/authentication_test.rb | 7 +-
test/integration/api_test/memberships_test.rb | 2 +-
test/integration/api_test/projects_test.rb | 12 +-
test/integration/application_test.rb | 2 +-
test/integration/attachments_test.rb | 2 +-
test/integration/feeds_test.rb | 2 +-
test/integration/issues_test.rb | 2 +-
test/integration/layout_test.rb | 2 +-
test/integration/lib/redmine/hook_test.rb | 4 +-
test/integration/lib/redmine/menu_manager_test.rb | 2 +-
test/integration/lib/redmine/themes_test.rb | 2 +-
test/integration/projects_test.rb | 2 +-
test/integration/repositories_git_test.rb | 2 +-
test/integration/routing/account_test.rb | 2 +-
test/integration/routing/activities_test.rb | 2 +-
test/integration/routing/admin_test.rb | 2 +-
test/integration/routing/attachments_test.rb | 2 +-
test/integration/routing/auth_sources_test.rb | 2 +-
test/integration/routing/auto_completes_test.rb | 2 +-
test/integration/routing/boards_test.rb | 2 +-
test/integration/routing/calendars_test.rb | 2 +-
test/integration/routing/comments_test.rb | 2 +-
test/integration/routing/context_menus_test.rb | 2 +-
test/integration/routing/custom_fields_test.rb | 2 +-
test/integration/routing/documents_test.rb | 2 +-
test/integration/routing/enumerations_test.rb | 2 +-
test/integration/routing/files_test.rb | 2 +-
test/integration/routing/gantts_test.rb | 2 +-
test/integration/routing/groups_test.rb | 2 +-
test/integration/routing/issue_categories_test.rb | 2 +-
test/integration/routing/issue_relations_test.rb | 2 +-
test/integration/routing/issue_statuses_test.rb | 2 +-
test/integration/routing/issues_test.rb | 2 +-
test/integration/routing/journals_test.rb | 2 +-
test/integration/routing/mail_handler_test.rb | 2 +-
test/integration/routing/members_test.rb | 2 +-
test/integration/routing/messages_test.rb | 2 +-
test/integration/routing/my_test.rb | 2 +-
test/integration/routing/news_test.rb | 2 +-
test/integration/routing/previews_test.rb | 2 +-
.../routing/project_enumerations_test.rb | 2 +-
test/integration/routing/projects_test.rb | 2 +-
test/integration/routing/queries_test.rb | 2 +-
test/integration/routing/reports_test.rb | 2 +-
test/integration/routing/repositories_test.rb | 2 +-
test/integration/routing/roles_test.rb | 2 +-
test/integration/routing/search_test.rb | 2 +-
test/integration/routing/settings_test.rb | 2 +-
test/integration/routing/sys_test.rb | 2 +-
test/integration/routing/timelog_test.rb | 2 +-
test/integration/routing/trackers_test.rb | 2 +-
test/integration/routing/users_test.rb | 2 +-
test/integration/routing/versions_test.rb | 2 +-
test/integration/routing/watchers_test.rb | 2 +-
test/integration/routing/welcome_test.rb | 2 +-
test/integration/routing/wiki_test.rb | 4 +-
test/integration/routing/wikis_test.rb | 2 +-
test/integration/routing/workflows_test.rb | 2 +-
test/integration/users_test.rb | 2 +-
test/object_helpers.rb | 2 +-
test/test_helper.rb | 20 +-
test/unit/changeset_test.rb | 50 +-
test/unit/custom_field_test.rb | 14 +-
test/unit/enabled_module_test.rb | 2 +-
test/unit/group_test.rb | 3 +-
test/unit/helpers/application_helper_test.rb | 50 +-
test/unit/helpers/projects_helper_test.rb | 1 +
test/unit/initializers/patches_test.rb | 42 +-
test/unit/issue_nested_set_test.rb | 12 +-
test/unit/issue_priority_test.rb | 8 +-
test/unit/issue_status_test.rb | 2 +-
test/unit/issue_test.rb | 46 +-
test/unit/journal_observer_test.rb | 59 +-
test/unit/journal_test.rb | 17 +-
test/unit/lib/redmine/codeset_util_test.rb | 65 +-
test/unit/lib/redmine/export/pdf_test.rb | 96 +-
test/unit/lib/redmine/hook_test.rb | 1 +
test/unit/lib/redmine/i18n_test.rb | 88 +-
test/unit/lib/redmine/notifiable_test.rb | 4 +-
.../redmine/scm/adapters/bazaar_adapter_test.rb | 343 ++++---
.../lib/redmine/scm/adapters/cvs_adapter_test.rb | 149 ++-
.../lib/redmine/scm/adapters/darcs_adapter_test.rb | 71 +-
.../lib/redmine/scm/adapters/git_adapter_test.rb | 1028 ++++++++++----------
.../redmine/scm/adapters/mercurial_adapter_test.rb | 781 ++++++++-------
.../scm/adapters/subversion_adapter_test.rb | 74 +-
test/unit/lib/redmine/unified_diff_test.rb | 36 +-
.../lib/redmine/wiki_formatting/macros_test.rb | 14 +-
test/unit/mail_handler_test.rb | 89 +-
test/unit/mailer_test.rb | 1 +
test/unit/member_test.rb | 7 +-
test/unit/principal_test.rb | 4 +-
test/unit/project_nested_set_test.rb | 7 +-
test/unit/project_test.rb | 4 +-
test/unit/query_test.rb | 8 +-
test/unit/repository_bazaar_test.rb | 74 +-
test/unit/repository_cvs_test.rb | 6 +-
test/unit/repository_darcs_test.rb | 3 +-
test/unit/repository_filesystem_test.rb | 3 +-
test/unit/repository_git_test.rb | 25 +-
test/unit/repository_mercurial_test.rb | 25 +-
test/unit/repository_subversion_test.rb | 8 +-
test/unit/repository_test.rb | 7 +-
test/unit/role_test.rb | 8 +-
test/unit/tracker_test.rb | 2 +-
test/unit/user_test.rb | 13 +-
test/unit/version_test.rb | 6 +-
test/unit/wiki_test.rb | 3 +-
test/unit/workflow_transition_test.rb | 93 ++
388 files changed, 3760 insertions(+), 3631 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