[DRE-commits] [redmine] 04/04: Merge branch 'master' into master-wheezy-backports
Antonio Terceiro
terceiro at moszumanska.debian.org
Thu Feb 13 10:02:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master-wheezy-backports
in repository redmine.
commit f57584d836485c219748deedb49b1fee4897d955
Merge: 33f18f5 3f8a217
Author: Antonio Terceiro <terceiro at debian.org>
Date: Thu Feb 13 06:55:51 2014 -0300
Merge branch 'master' into master-wheezy-backports
Conflicts:
debian/changelog
debian/control
debian/gbp.conf
.gitignore | 8 +
.hgignore | 2 +
CONTRIBUTING.md | 8 +
Gemfile | 21 +-
app/controllers/account_controller.rb | 77 +-
app/controllers/admin_controller.rb | 5 +-
app/controllers/application_controller.rb | 66 +-
app/controllers/boards_controller.rb | 2 +-
app/controllers/context_menus_controller.rb | 9 +-
app/controllers/custom_fields_controller.rb | 12 +-
app/controllers/issue_statuses_controller.rb | 4 +-
app/controllers/issues_controller.rb | 78 +-
app/controllers/messages_controller.rb | 2 +-
app/controllers/my_controller.rb | 12 +-
app/controllers/projects_controller.rb | 4 +-
app/controllers/queries_controller.rb | 24 +-
app/controllers/repositories_controller.rb | 28 +-
app/controllers/settings_controller.rb | 7 +-
app/controllers/sys_controller.rb | 6 +-
app/controllers/timelog_controller.rb | 27 +-
app/controllers/users_controller.rb | 14 +-
app/controllers/versions_controller.rb | 10 +-
app/controllers/wiki_controller.rb | 30 +-
app/helpers/application_helper.rb | 74 +-
app/helpers/custom_fields_helper.rb | 49 +-
app/helpers/issues_helper.rb | 94 +-
app/helpers/projects_helper.rb | 7 +-
app/helpers/queries_helper.rb | 3 +-
app/helpers/versions_helper.rb | 7 +-
app/helpers/watchers_helper.rb | 2 +-
app/helpers/workflows_helper.rb | 13 +-
app/models/attachment.rb | 31 +-
app/models/changeset.rb | 36 +-
app/models/comment.rb | 11 +
app/models/comment_observer.rb | 24 -
app/models/custom_field.rb | 85 +-
app/models/document.rb | 10 +
app/models/issue.rb | 210 ++--
app/models/issue_custom_field.rb | 19 +-
app/models/issue_observer.rb | 22 -
app/models/issue_query.rb | 151 ++-
app/models/issue_relation.rb | 28 +
app/models/journal.rb | 69 +-
app/models/journal_detail.rb | 6 +
app/models/journal_observer.rb | 29 -
app/models/mail_handler.rb | 82 +-
app/models/mailer.rb | 146 +--
app/models/message.rb | 7 +
app/models/message_observer.rb | 22 -
app/models/news.rb | 7 +
app/models/project.rb | 53 +-
app/models/query.rb | 127 ++-
app/models/repository.rb | 25 +-
app/models/repository/bazaar.rb | 14 +-
app/models/repository/cvs.rb | 21 +-
app/models/repository/git.rb | 17 +-
app/models/repository/subversion.rb | 2 +-
app/models/role.rb | 3 +-
app/models/setting.rb | 76 +-
app/models/time_entry_query.rb | 21 +-
app/models/user.rb | 92 +-
app/models/user_preference.rb | 2 +-
app/models/version.rb | 2 +-
app/models/watcher.rb | 13 +
app/models/wiki.rb | 4 +-
app/models/wiki_content.rb | 17 +
app/models/wiki_content_observer.rb | 28 -
app/models/wiki_page.rb | 3 +-
app/views/account/login.html.erb | 18 +-
app/views/activities/index.html.erb | 16 +-
app/views/admin/info.html.erb | 4 +-
app/views/admin/plugins.html.erb | 4 +-
app/views/admin/projects.html.erb | 8 +-
app/views/attachments/upload.js.erb | 5 +
app/views/auth_sources/edit.html.erb | 2 +-
app/views/auth_sources/index.html.erb | 10 +-
app/views/auth_sources/new.html.erb | 2 +-
app/views/boards/index.html.erb | 2 +-
app/views/common/_file.html.erb | 4 +-
app/views/common/_tabs.html.erb | 2 +-
app/views/context_menus/issues.html.erb | 2 +-
app/views/custom_fields/_form.html.erb | 76 +-
app/views/custom_fields/_index.html.erb | 16 +-
app/views/custom_fields/edit.html.erb | 7 +-
app/views/custom_fields/index.api.rsb | 42 +
app/views/custom_fields/index.html.erb | 4 +-
app/views/custom_fields/new.html.erb | 7 +-
app/views/documents/index.html.erb | 16 +-
app/views/enumerations/destroy.html.erb | 2 +-
app/views/enumerations/edit.html.erb | 2 +-
app/views/enumerations/index.html.erb | 20 +-
app/views/enumerations/new.html.erb | 2 +-
app/views/files/index.html.erb | 4 +-
app/views/gantts/show.html.erb | 27 +-
app/views/groups/edit.html.erb | 4 +-
app/views/groups/index.html.erb | 6 +-
app/views/groups/new.html.erb | 2 +-
app/views/groups/show.html.erb | 2 +-
app/views/issue_relations/create.js.erb | 1 +
app/views/issue_statuses/edit.html.erb | 2 +-
app/views/issue_statuses/index.html.erb | 10 +-
app/views/issue_statuses/new.html.erb | 2 +-
app/views/issues/_attributes.html.erb | 12 +-
app/views/issues/_form_custom_fields.html.erb | 5 +-
app/views/issues/_history.html.erb | 2 +-
app/views/issues/_relations.html.erb | 2 +-
app/views/issues/_sidebar.html.erb | 14 +-
app/views/issues/bulk_edit.html.erb | 112 +-
app/views/issues/index.api.rsb | 2 +-
app/views/issues/new.html.erb | 2 +-
app/views/issues/show.api.rsb | 4 +-
app/views/issues/update_form.js.erb | 2 +-
app/views/journals/diff.html.erb | 7 +-
app/views/layouts/base.html.erb | 2 +-
app/views/layouts/mailer.html.erb | 7 +-
app/views/layouts/mailer.text.erb | 4 +
app/views/mailer/_issue.html.erb | 11 +-
app/views/mailer/_issue.text.erb | 9 +-
app/views/mailer/issue_add.html.erb | 2 +-
app/views/mailer/issue_add.text.erb | 2 +-
app/views/mailer/issue_edit.html.erb | 4 +-
app/views/mailer/issue_edit.text.erb | 4 +-
app/views/my/account.html.erb | 1 +
app/views/my/blocks/_issuesassignedtome.html.erb | 13 +-
app/views/my/blocks/_issuesreportedbyme.html.erb | 14 +-
app/views/my/blocks/_issueswatched.html.erb | 15 +-
app/views/my/blocks/_timelog.html.erb | 7 +-
app/views/my/destroy.html.erb | 6 +-
app/views/my/password.html.erb | 4 +
app/views/projects/_form.html.erb | 13 +-
app/views/projects/destroy.html.erb | 4 +-
app/views/projects/index.html.erb | 4 +-
app/views/projects/new.html.erb | 2 +-
app/views/projects/settings/_activities.html.erb | 10 +-
app/views/projects/settings/_boards.html.erb | 8 +-
.../projects/settings/_issue_categories.html.erb | 6 +-
app/views/projects/settings/_members.html.erb | 74 +-
app/views/projects/settings/_repositories.html.erb | 4 +-
app/views/queries/_form.html.erb | 32 +-
app/views/queries/index.api.rsb | 2 +-
app/views/queries/index.html.erb | 6 +-
app/views/reports/_details.html.erb | 23 +-
app/views/reports/_simple.html.erb | 18 +-
app/views/repositories/_breadcrumbs.html.erb | 2 +-
app/views/repositories/_form.html.erb | 16 +-
app/views/repositories/_navigation.html.erb | 2 +-
app/views/repositories/annotate.html.erb | 18 +-
app/views/repositories/revision.html.erb | 6 +-
app/views/repositories/stats.html.erb | 12 +-
app/views/roles/edit.html.erb | 2 +-
app/views/roles/index.html.erb | 4 +-
app/views/roles/new.html.erb | 2 +-
app/views/roles/permissions.html.erb | 6 +-
app/views/search/index.html.erb | 24 +-
app/views/settings/_issues.html.erb | 2 +-
app/views/settings/_mail_handler.html.erb | 5 +
app/views/settings/_repositories.html.erb | 87 +-
app/views/settings/plugin.html.erb | 2 +-
app/views/timelog/_list.html.erb | 2 +-
app/views/timelog/_report_criteria.html.erb | 2 +-
app/views/timelog/report.html.erb | 4 +-
app/views/trackers/_form.html.erb | 4 +-
app/views/trackers/edit.html.erb | 2 +-
app/views/trackers/fields.html.erb | 12 +-
app/views/trackers/index.html.erb | 6 +-
app/views/trackers/new.html.erb | 2 +-
app/views/users/_form.html.erb | 16 +
app/views/users/_mail_notifications.html.erb | 6 +-
app/views/users/edit.html.erb | 4 +-
app/views/users/index.html.erb | 6 +-
app/views/users/new.html.erb | 2 +-
app/views/users/show.api.rsb | 1 +
app/views/users/show.html.erb | 2 +-
app/views/versions/_issue_counts.html.erb | 4 +-
app/views/versions/_overview.html.erb | 23 +-
app/views/versions/index.html.erb | 93 +-
app/views/versions/show.html.erb | 4 +-
app/views/wiki/_sidebar.html.erb | 11 +-
app/views/wiki/annotate.html.erb | 13 +-
app/views/wiki/diff.html.erb | 4 +-
app/views/wiki/history.html.erb | 4 +-
app/views/wiki/show.api.rsb | 2 +-
app/views/wiki/show.html.erb | 4 +
app/views/workflows/_action_menu.html.erb | 1 -
app/views/workflows/_form.html.erb | 10 +-
app/views/workflows/copy.html.erb | 4 +-
app/views/workflows/edit.html.erb | 4 +-
app/views/workflows/index.html.erb | 8 +-
app/views/workflows/permissions.html.erb | 31 +-
config/application.rb | 5 +-
config/configuration.yml.example | 5 +
config/initializers/00-core_plugins.rb | 2 +-
config/initializers/10-patches.rb | 37 +
config/initializers/30-redmine.rb | 7 +
config/locales/ar.yml | 364 ++++---
config/locales/az.yml | 26 +-
config/locales/bg.yml | 26 +-
config/locales/bs.yml | 24 +-
config/locales/ca.yml | 22 +-
config/locales/cs.yml | 23 +-
config/locales/da.yml | 22 +-
config/locales/de.yml | 28 +-
config/locales/el.yml | 22 +-
config/locales/en-GB.yml | 24 +-
config/locales/en.yml | 22 +-
config/locales/es.yml | 21 +-
config/locales/et.yml | 22 +-
config/locales/eu.yml | 22 +-
config/locales/fa.yml | 22 +-
config/locales/fi.yml | 22 +-
config/locales/fr.yml | 28 +-
config/locales/gl.yml | 22 +-
config/locales/he.yml | 22 +-
config/locales/hr.yml | 28 +-
config/locales/hu.yml | 24 +-
config/locales/id.yml | 22 +-
config/locales/it.yml | 39 +-
config/locales/ja.yml | 50 +-
config/locales/ko.yml | 20 +-
config/locales/lt.yml | 126 ++-
config/locales/lv.yml | 22 +-
config/locales/mk.yml | 22 +-
config/locales/mn.yml | 22 +-
config/locales/nl.yml | 90 +-
config/locales/no.yml | 26 +-
config/locales/pl.yml | 17 +-
config/locales/pt-BR.yml | 146 +--
config/locales/pt.yml | 24 +-
config/locales/ro.yml | 20 +-
config/locales/ru.yml | 49 +-
config/locales/sk.yml | 1113 ++++++++++----------
config/locales/sl.yml | 72 +-
config/locales/sq.yml | 22 +-
config/locales/sr-YU.yml | 22 +-
config/locales/sr.yml | 22 +-
config/locales/sv.yml | 22 +-
config/locales/th.yml | 22 +-
config/locales/tr.yml | 301 +++---
config/locales/uk.yml | 22 +-
config/locales/vi.yml | 22 +-
config/locales/zh-TW.yml | 24 +-
config/locales/zh.yml | 51 +-
config/routes.rb | 1 +
config/settings.yml | 12 +-
db/migrate/20130602092539_create_queries_roles.rb | 13 +
.../20130710182539_add_queries_visibility.rb | 13 +
.../20130713104233_create_custom_fields_roles.rb | 14 +
db/migrate/20130713111657_add_queries_options.rb | 9 +
.../20130729070143_add_users_must_change_passwd.rb | 9 +
...193200_remove_eols_from_attachments_filename.rb | 12 +
...4113137_support_for_multiple_commit_keywords.rb | 17 +
.../20131005100610_add_repositories_created_on.rb | 9 +
debian/changelog | 45 +-
debian/config | 9 +-
debian/control | 12 +-
debian/gbp.conf | 2 -
debian/patches/1001_Parsedate.parsedate.patch | 16 +
debian/patches/2002_FHS_through_env_vars.patch | 40 +-
.../patches/2003_externalize_session_config.patch | 10 +-
debian/patches/2004_FHS_plugins_assets.patch | 4 +-
.../patches/2008_force_table_encoding_mysql.patch | 4 +-
debian/patches/2009_FHS_thin_config.patch | 4 +-
debian/patches/2017_Gemfile_debian.patch | 20 +-
debian/patches/2018_get_rid_of_rdoctask.patch | 16 +-
debian/patches/series | 1 +
debian/postinst | 9 +-
doc/CHANGELOG | 142 +++
doc/RUNNING_TESTS | 3 +-
extra/mail_handler/rdm-mailhandler.rb | 28 +-
.../lib/acts_as_activity_provider.rb | 10 +-
.../acts_as_searchable/lib/acts_as_searchable.rb | 11 +-
.../acts_as_versioned/lib/acts_as_versioned.rb | 2 +-
.../acts_as_watchable/lib/acts_as_watchable.rb | 6 +-
.../open_id_authentication/test/test_helper.rb | 2 +-
lib/plugins/rfpdf/lib/config/lang/eng.rb | 0
lib/plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT | 0
.../rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php | 0
lib/plugins/rfpdf/lib/fpdf/fpdf_eps.rb | 139 ---
lib/plugins/rfpdf/lib/tcpdf.rb | 4 +-
lib/plugins/rfpdf/logo_example.png | Bin
lib/plugins/rfpdf/utf8test.txt | 0
lib/redcloth3.rb | 6 +-
lib/redmine/custom_field_format.rb | 7 +
lib/redmine/export/pdf.rb | 21 +-
lib/redmine/helpers/diff.rb | 2 +
lib/redmine/helpers/gantt.rb | 41 +-
lib/redmine/info.rb | 12 +-
lib/redmine/menu_manager.rb | 2 +
lib/redmine/plugin.rb | 17 +-
.../redmine/scm/adapters.rb | 9 +-
lib/redmine/scm/adapters/abstract_adapter.rb | 3 -
lib/redmine/scm/adapters/bazaar_adapter.rb | 2 +-
lib/redmine/scm/adapters/git_adapter.rb | 2 +-
lib/redmine/version.rb | 4 +-
lib/redmine/wiki_formatting/textile/helper.rb | 2 +-
lib/tasks/ci.rake | 21 +-
lib/tasks/email.rake | 30 +-
lib/tasks/jdbc.rake | 8 -
lib/tasks/migrate_from_mantis.rake | 20 +-
lib/tasks/migrate_from_trac.rake | 29 +-
public/favicon.ico | Bin 7886 -> 7886 bytes
public/help/ar/wiki_syntax.html | 66 ++
public/help/{ => ar}/wiki_syntax_detailed.html | 20 +-
public/help/az/wiki_syntax.html | 66 ++
public/help/{ => az}/wiki_syntax_detailed.html | 20 +-
public/help/bg/wiki_syntax.html | 66 ++
public/help/{ => bg}/wiki_syntax_detailed.html | 20 +-
public/help/bs/wiki_syntax.html | 66 ++
public/help/{ => bs}/wiki_syntax_detailed.html | 20 +-
public/help/ca/wiki_syntax.html | 66 ++
public/help/{ => ca}/wiki_syntax_detailed.html | 20 +-
public/help/cs/wiki_syntax.html | 66 ++
public/help/cs/wiki_syntax_detailed.html | 287 +++++
public/help/da/wiki_syntax.html | 66 ++
public/help/{ => da}/wiki_syntax_detailed.html | 20 +-
public/help/de/wiki_syntax.html | 66 ++
public/help/{ => de}/wiki_syntax_detailed.html | 20 +-
public/help/el/wiki_syntax.html | 66 ++
public/help/{ => el}/wiki_syntax_detailed.html | 20 +-
public/help/en-gb/wiki_syntax.html | 66 ++
public/help/{ => en-gb}/wiki_syntax_detailed.html | 20 +-
public/help/en/wiki_syntax.html | 66 ++
public/help/{ => en}/wiki_syntax_detailed.html | 20 +-
public/help/es/wiki_syntax.html | 66 ++
public/help/{ => es}/wiki_syntax_detailed.html | 20 +-
public/help/et/wiki_syntax.html | 66 ++
public/help/{ => et}/wiki_syntax_detailed.html | 20 +-
public/help/eu/wiki_syntax.html | 66 ++
public/help/{ => eu}/wiki_syntax_detailed.html | 20 +-
public/help/fa/wiki_syntax.html | 66 ++
public/help/{ => fa}/wiki_syntax_detailed.html | 20 +-
public/help/fi/wiki_syntax.html | 66 ++
public/help/{ => fi}/wiki_syntax_detailed.html | 20 +-
public/help/fr/wiki_syntax.html | 66 ++
public/help/fr/wiki_syntax_detailed.html | 287 +++++
public/help/gl/wiki_syntax.html | 66 ++
public/help/{ => gl}/wiki_syntax_detailed.html | 20 +-
public/help/he/wiki_syntax.html | 66 ++
public/help/{ => he}/wiki_syntax_detailed.html | 20 +-
public/help/hr/wiki_syntax.html | 66 ++
public/help/{ => hr}/wiki_syntax_detailed.html | 20 +-
public/help/hu/wiki_syntax.html | 66 ++
public/help/{ => hu}/wiki_syntax_detailed.html | 20 +-
public/help/id/wiki_syntax.html | 66 ++
public/help/{ => id}/wiki_syntax_detailed.html | 20 +-
public/help/it/wiki_syntax.html | 66 ++
public/help/{ => it}/wiki_syntax_detailed.html | 20 +-
public/help/ja/wiki_syntax.html | 66 ++
public/help/ja/wiki_syntax_detailed.html | 287 +++++
public/help/ko/wiki_syntax.html | 66 ++
public/help/{ => ko}/wiki_syntax_detailed.html | 20 +-
public/help/lt/wiki_syntax.html | 66 ++
public/help/{ => lt}/wiki_syntax_detailed.html | 20 +-
public/help/lv/wiki_syntax.html | 66 ++
public/help/{ => lv}/wiki_syntax_detailed.html | 20 +-
public/help/mk/wiki_syntax.html | 66 ++
public/help/{ => mk}/wiki_syntax_detailed.html | 20 +-
public/help/mn/wiki_syntax.html | 66 ++
public/help/{ => mn}/wiki_syntax_detailed.html | 20 +-
public/help/nl/wiki_syntax.html | 66 ++
public/help/{ => nl}/wiki_syntax_detailed.html | 20 +-
public/help/no/wiki_syntax.html | 66 ++
public/help/{ => no}/wiki_syntax_detailed.html | 20 +-
public/help/pl/wiki_syntax.html | 66 ++
public/help/{ => pl}/wiki_syntax_detailed.html | 20 +-
public/help/pt-br/wiki_syntax.html | 66 ++
public/help/{ => pt-br}/wiki_syntax_detailed.html | 20 +-
public/help/pt/wiki_syntax.html | 66 ++
public/help/{ => pt}/wiki_syntax_detailed.html | 20 +-
public/help/ro/wiki_syntax.html | 66 ++
public/help/{ => ro}/wiki_syntax_detailed.html | 20 +-
public/help/ru/wiki_syntax.html | 171 +++
public/help/ru/wiki_syntax_detailed.html | 329 ++++++
public/help/sk/wiki_syntax.html | 66 ++
public/help/{ => sk}/wiki_syntax_detailed.html | 20 +-
public/help/sl/wiki_syntax.html | 66 ++
public/help/{ => sl}/wiki_syntax_detailed.html | 20 +-
public/help/sq/wiki_syntax.html | 66 ++
public/help/{ => sq}/wiki_syntax_detailed.html | 20 +-
public/help/sr-yu/wiki_syntax.html | 66 ++
public/help/{ => sr-yu}/wiki_syntax_detailed.html | 20 +-
public/help/sr/wiki_syntax.html | 66 ++
public/help/{ => sr}/wiki_syntax_detailed.html | 20 +-
public/help/sv/wiki_syntax.html | 66 ++
public/help/{ => sv}/wiki_syntax_detailed.html | 20 +-
public/help/th/wiki_syntax.html | 66 ++
public/help/{ => th}/wiki_syntax_detailed.html | 20 +-
public/help/tr/wiki_syntax.html | 66 ++
public/help/{ => tr}/wiki_syntax_detailed.html | 20 +-
public/help/uk/wiki_syntax.html | 66 ++
public/help/{ => uk}/wiki_syntax_detailed.html | 20 +-
public/help/vi/wiki_syntax.html | 66 ++
public/help/{ => vi}/wiki_syntax_detailed.html | 20 +-
public/help/wiki_syntax.html | 66 --
public/help/zh-tw/wiki_syntax.html | 66 ++
public/help/zh-tw/wiki_syntax_detailed.html | 287 +++++
public/help/zh/wiki_syntax.html | 66 ++
public/help/{ => zh}/wiki_syntax_detailed.html | 20 +-
public/images/document.png | Bin 333 -> 374 bytes
public/images/message.png | Bin 365 -> 383 bytes
public/images/wiki_edit.png | Bin 464 -> 533 bytes
public/javascripts/application.js | 95 +-
public/javascripts/attachments.js | 2 +-
public/javascripts/datepicker.js | 16 +
public/javascripts/gantt.js | 2 +-
public/javascripts/i18n/jquery.ui.datepicker-de.js | 8 +-
public/javascripts/i18n/jquery.ui.datepicker-lt.js | 10 +-
public/javascripts/jstoolbar/lang/jstoolbar-sk.js | 16 +-
public/javascripts/select_list_move.js | 39 +-
public/stylesheets/application.css | 42 +-
public/stylesheets/scm.css | 3 +
test/fixtures/custom_fields_trackers.yml | 9 +
test/fixtures/mail_handler/multiple_text_parts.eml | 62 ++
test/fixtures/queries.yml | 18 +-
test/fixtures/repositories.yml | 2 +
.../fixtures/repositories/bazaar_repository.tar.gz | Bin 25056 -> 30817 bytes
test/functional/account_controller_openid_test.rb | 36 +-
test/functional/account_controller_test.rb | 67 ++
test/functional/boards_controller_test.rb | 2 +-
test/functional/calendars_controller_test.rb | 2 +-
test/functional/context_menus_controller_test.rb | 8 +-
test/functional/custom_fields_controller_test.rb | 27 +-
test/functional/gantts_controller_test.rb | 4 +-
test/functional/issue_relations_controller_test.rb | 2 -
test/functional/issues_controller_test.rb | 261 +++--
.../issues_custom_fields_visibility_test.rb | 322 ++++++
test/functional/projects_controller_test.rb | 17 +-
test/functional/queries_controller_test.rb | 71 +-
.../repositories_bazaar_controller_test.rb | 92 +-
test/functional/repositories_controller_test.rb | 35 +-
.../functional/repositories_git_controller_test.rb | 34 +-
.../repositories_mercurial_controller_test.rb | 49 +-
.../repositories_subversion_controller_test.rb | 4 +-
.../search_custom_fields_visibility_test.rb | 78 ++
test/functional/settings_controller_test.rb | 55 +
.../time_entry_reports_controller_test.rb | 6 +-
test/functional/timelog_controller_test.rb | 19 +
.../timelog_custom_fields_visibility_test.rb | 113 ++
test/functional/users_controller_test.rb | 73 +-
test/functional/versions_controller_test.rb | 32 +-
test/functional/welcome_controller_test.rb | 86 +-
test/functional/wiki_controller_test.rb | 27 +-
test/functional/workflows_controller_test.rb | 25 +-
test/integration/account_test.rb | 112 +-
.../api_test/{enumerations_test.rb => api_test.rb} | 33 +-
...{enumerations_test.rb => custom_fields_test.rb} | 27 +-
test/integration/api_test/enumerations_test.rb | 22 +-
test/integration/api_test/groups_test.rb | 262 ++---
test/integration/api_test/issue_categories_test.rb | 132 +--
test/integration/api_test/issue_relations_test.rb | 104 +-
test/integration/api_test/issue_statuses_test.rb | 37 +-
test/integration/api_test/issues_test.rb | 14 +-
test/integration/api_test/memberships_test.rb | 286 +++--
test/integration/api_test/news_test.rb | 93 +-
test/integration/api_test/projects_test.rb | 426 ++++----
test/integration/api_test/queries_test.rb | 37 +-
test/integration/api_test/roles_test.rb | 88 +-
test/integration/api_test/time_entries_test.rb | 196 ++--
.../api_test/token_authentication_test.rb | 11 +-
test/integration/api_test/trackers_test.rb | 37 +-
test/integration/api_test/users_test.rb | 544 +++++-----
test/integration/api_test/versions_test.rb | 204 ++--
test/integration/api_test/wiki_pages_test.rb | 1 +
test/integration/application_test.rb | 12 +
test/integration/routing/custom_fields_test.rb | 7 +
test/object_helpers.rb | 21 +-
test/test_helper.rb | 18 +-
test/ui/base.rb | 15 +-
test/ui/issues_test.rb | 55 +-
test/unit/attachment_test.rb | 7 +
test/unit/board_test.rb | 2 +-
test/unit/changeset_test.rb | 79 +-
test/unit/custom_field_test.rb | 52 +
test/unit/helpers/activities_helper_test.rb | 1 +
test/unit/helpers/application_helper_test.rb | 89 +-
test/unit/helpers/custom_fields_helper_test.rb | 2 +-
test/unit/helpers/issues_helper_test.rb | 165 ++-
test/unit/helpers/projects_helper_test.rb | 1 +
test/unit/helpers/queries_helper_test.rb | 32 +-
test/unit/helpers/search_helper_test.rb | 1 +
test/unit/helpers/sort_helper_test.rb | 1 +
test/unit/helpers/timelog_helper_test.rb | 1 +
test/unit/initializers/patches_test.rb | 24 +-
.../patches_test.rb => issue_custom_field_test.rb} | 32 +-
test/unit/issue_nested_set_test.rb | 35 +
test/unit/issue_relation_test.rb | 48 +-
test/unit/issue_status_test.rb | 8 +-
test/unit/issue_test.rb | 85 +-
test/unit/journal_test.rb | 47 +-
.../unit/lib/redmine/helpers/diff_test.rb | 9 +-
test/unit/lib/redmine/helpers/gantt_test.rb | 96 +-
test/unit/lib/redmine/hook_test.rb | 4 +-
test/unit/lib/redmine/i18n_test.rb | 21 +-
test/unit/lib/redmine/menu_manager/mapper_test.rb | 13 +-
test/unit/lib/redmine/plugin_test.rb | 24 +-
.../redmine/scm/adapters/bazaar_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/cvs_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/darcs_adapter_test.rb | 2 +-
.../lib/redmine/scm/adapters/git_adapter_test.rb | 23 +-
.../redmine/scm/adapters/mercurial_adapter_test.rb | 2 +-
.../scm/adapters/subversion_adapter_test.rb | 2 +-
.../wiki_formatting/textile_formatter_test.rb | 44 +-
test/unit/mail_handler_test.rb | 63 +-
test/unit/mailer_test.rb | 173 ++-
test/unit/project_copy_test.rb | 10 +-
test/unit/project_members_inheritance_test.rb | 11 +-
test/unit/project_test.rb | 12 +-
test/unit/query_test.rb | 173 ++-
test/unit/repository_subversion_test.rb | 30 +-
test/unit/repository_test.rb | 11 +-
test/unit/role_test.rb | 56 +-
test/unit/search_test.rb | 4 +-
test/unit/setting_test.rb | 6 +-
test/unit/time_entry_query_test.rb | 40 +
test/unit/token_test.rb | 5 -
test/unit/user_test.rb | 219 ++--
test/unit/version_test.rb | 145 ++-
test/unit/watcher_test.rb | 17 +
test/unit/wiki_content_test.rb | 6 +-
test/unit/wiki_test.rb | 26 +-
test/unit/workflow_test.rb | 6 +-
521 files changed, 14384 insertions(+), 5623 deletions(-)
diff --cc debian/changelog
index 44b6fef,5a59d48..4a8db12
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,17 +1,28 @@@
- redmine (2.3.3-3.1~bpo70+1) wheezy-backports; urgency=low
++redmine (2.4.2-1~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Drop strict dependency on ruby-railties-3.2 (>= 3.2.13-2~). The
+ `rake tmp:cache:clear` command will not work.
+ * debian/install: do not install Gemfile as passenger will try to load it,
+ and will fail because this Gemfile is stricter than what we can provide in
+ wheezy (e.g. it requires rails >= 3.2.12).
+
+ -- Antonio Terceiro <terceiro at debian.org> Sat, 05 Oct 2013 13:51:23 -0300
+
+ redmine (2.4.2-1) unstable; urgency=low
+
+ * New upstream version 2.4.2
+ * Update patches for 2.4.2 release
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 28 Jan 2014 11:25:00 +0100
+
+ redmine (2.4.1-1) unstable; urgency=low
+
+ * New upstream version 2.4.1
+ * Refresh patches for 2.4.1 release
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 03 Dec 2013 12:04:41 +0100
+
redmine (2.3.3-3.1) unstable; urgency=medium
* Non-maintainer upload.
diff --cc debian/gbp.conf
index 910ac90,ad1914a..5e5582e
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -4,11 -4,10 +4,9 @@@
pristine-tar = True
sign-tags = True
- # there are separate branches for stable and experimental
-upstream-branch = upstream
-debian-branch = master
-
+upstream-branch = upstream-wheezy-backports
+debian-branch = master-wheezy-backports
-
[git-import-orig]
filter-pristine-tar = True
# filter out *.bak, *~ files upstream sometimes let through.
--
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