[DRE-commits] [redmine] 01/02: Merge branch 'master-experimental'

Antonio Terceiro terceiro at moszumanska.debian.org
Thu Jan 16 15:57:51 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 4c1678d23e023b09e6f9ef2eadb1f6f946d86a65
Merge: 4264477 9fc0579
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 16 16:54:31 2014 +0100

    Merge branch 'master-experimental'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/postinst

 .gitignore                                         |   11 +
 .hgignore                                          |    5 +
 CONTRIBUTING.md                                    |    8 +
 Gemfile                                            |  101 +-
 Rakefile                                           |   16 +-
 app/controllers/account_controller.rb              |  156 +-
 app/controllers/activities_controller.rb           |    6 +-
 app/controllers/admin_controller.rb                |   22 +-
 app/controllers/application_controller.rb          |  268 +-
 app/controllers/attachments_controller.rb          |   70 +-
 app/controllers/auth_sources_controller.rb         |   42 +-
 app/controllers/auto_completes_controller.rb       |   39 +-
 app/controllers/boards_controller.rb               |   32 +-
 app/controllers/calendars_controller.rb            |    2 +-
 app/controllers/comments_controller.rb             |    6 +-
 app/controllers/context_menus_controller.rb        |   30 +-
 app/controllers/custom_fields_controller.rb        |   35 +-
 app/controllers/documents_controller.rb            |   18 +-
 app/controllers/enumerations_controller.rb         |   35 +-
 app/controllers/files_controller.rb                |   23 +-
 app/controllers/gantts_controller.rb               |    2 +-
 app/controllers/groups_controller.rb               |  119 +-
 app/controllers/issue_categories_controller.rb     |   43 +-
 app/controllers/issue_relations_controller.rb      |   23 +-
 app/controllers/issue_statuses_controller.rb       |   20 +-
 app/controllers/issues_controller.rb               |  181 +-
 app/controllers/journals_controller.rb             |   36 +-
 app/controllers/mail_handler_controller.rb         |    2 +-
 app/controllers/members_controller.rb              |   71 +-
 app/controllers/messages_controller.rb             |   57 +-
 app/controllers/my_controller.rb                   |   59 +-
 app/controllers/news_controller.rb                 |   12 +-
 app/controllers/previews_controller.rb             |   11 +-
 app/controllers/project_enumerations_controller.rb |   22 +-
 app/controllers/projects_controller.rb             |  103 +-
 app/controllers/queries_controller.rb              |   45 +-
 app/controllers/reports_controller.rb              |    8 +-
 app/controllers/repositories_controller.rb         |  114 +-
 app/controllers/roles_controller.rb                |   35 +-
 app/controllers/search_controller.rb               |    9 +-
 app/controllers/settings_controller.rb             |   23 +-
 app/controllers/sys_controller.rb                  |    8 +-
 app/controllers/timelog_controller.rb              |  135 +-
 app/controllers/trackers_controller.rb             |   44 +-
 app/controllers/users_controller.rb                |   81 +-
 app/controllers/versions_controller.rb             |   71 +-
 app/controllers/watchers_controller.rb             |  109 +-
 app/controllers/welcome_controller.rb              |    2 +-
 app/controllers/wiki_controller.rb                 |  146 +-
 app/controllers/wikis_controller.rb                |    5 +-
 app/controllers/workflows_controller.rb            |   62 +-
 app/helpers/account_helper.rb                      |    2 +-
 app/helpers/activities_helper.rb                   |   33 +
 app/helpers/admin_helper.rb                        |    6 +-
 app/helpers/application_helper.rb                  |  563 +-
 app/helpers/attachments_helper.rb                  |    8 +-
 app/helpers/auth_sources_helper.rb                 |    2 +-
 app/helpers/boards_helper.rb                       |   22 +-
 app/helpers/calendars_helper.rb                    |    2 +-
 app/helpers/context_menus_helper.rb                |    8 +-
 app/helpers/custom_fields_helper.rb                |   98 +-
 app/helpers/documents_helper.rb                    |    2 +-
 app/helpers/enumerations_helper.rb                 |    2 +-
 app/helpers/gantt_helper.rb                        |   10 +-
 app/helpers/groups_helper.rb                       |   26 +-
 app/helpers/issue_categories_helper.rb             |    2 +-
 app/helpers/issue_relations_helper.rb              |    2 +-
 app/helpers/issue_statuses_helper.rb               |    2 +-
 app/helpers/issues_helper.rb                       |  214 +-
 app/helpers/journals_helper.rb                     |   14 +-
 app/helpers/mail_handler_helper.rb                 |    2 +-
 app/helpers/members_helper.rb                      |   16 +-
 app/helpers/messages_helper.rb                     |    2 +-
 app/helpers/my_helper.rb                           |   52 +-
 app/helpers/news_helper.rb                         |    2 +-
 app/helpers/projects_helper.rb                     |   48 +-
 app/helpers/queries_helper.rb                      |  153 +-
 app/helpers/reports_helper.rb                      |    9 +-
 app/helpers/repositories_helper.rb                 |   47 +-
 app/helpers/roles_helper.rb                        |    2 +-
 app/helpers/routes_helper.rb                       |   39 +
 app/helpers/search_helper.rb                       |    2 +-
 app/helpers/settings_helper.rb                     |   27 +-
 app/helpers/sort_helper.rb                         |   13 +-
 app/helpers/timelog_helper.rb                      |   56 +-
 app/helpers/trackers_helper.rb                     |    2 +-
 app/helpers/users_helper.rb                        |   11 +-
 app/helpers/versions_helper.rb                     |   24 +-
 app/helpers/watchers_helper.rb                     |   58 +-
 app/helpers/welcome_helper.rb                      |    2 +-
 app/helpers/wiki_helper.rb                         |   10 +-
 app/helpers/workflows_helper.rb                    |   22 +-
 app/models/attachment.rb                           |  144 +-
 app/models/auth_source.rb                          |   23 +-
 app/models/auth_source_ldap.rb                     |   87 +-
 app/models/board.rb                                |   44 +-
 app/models/change.rb                               |    2 +-
 app/models/changeset.rb                            |   59 +-
 app/models/comment.rb                              |   13 +-
 app/models/comment_observer.rb                     |   24 -
 app/models/custom_field.rb                         |  209 +-
 app/models/custom_field_value.rb                   |    2 +-
 app/models/custom_value.rb                         |    2 +-
 app/models/document.rb                             |   23 +-
 app/models/document_category.rb                    |    8 +-
 app/models/document_category_custom_field.rb       |    2 +-
 app/models/document_observer.rb                    |   22 -
 app/models/enabled_module.rb                       |    2 +-
 app/models/enumeration.rb                          |   18 +-
 app/models/group.rb                                |   30 +-
 app/models/group_custom_field.rb                   |    2 +-
 app/models/issue.rb                                |  791 ++-
 app/models/issue_category.rb                       |    8 +-
 app/models/issue_custom_field.rb                   |   21 +-
 app/models/issue_observer.rb                       |   22 -
 app/models/issue_priority.rb                       |   36 +-
 app/models/issue_priority_custom_field.rb          |    2 +-
 app/models/issue_query.rb                          |  483 ++
 app/models/issue_relation.rb                       |  105 +-
 app/models/issue_status.rb                         |   39 +-
 app/models/journal.rb                              |  115 +-
 app/models/journal_detail.rb                       |   15 +-
 app/models/journal_observer.rb                     |   29 -
 app/models/mail_handler.rb                         |  203 +-
 app/models/mailer.rb                               |  505 +-
 app/models/member.rb                               |   23 +-
 app/models/member_role.rb                          |   27 +-
 app/models/message.rb                              |   33 +-
 app/models/message_observer.rb                     |   22 -
 app/models/news.rb                                 |   25 +-
 app/models/news_observer.rb                        |   22 -
 app/models/principal.rb                            |   49 +-
 app/models/project.rb                              |  364 +-
 app/models/project_custom_field.rb                 |    2 +-
 app/models/query.rb                                |  787 +--
 app/models/repository.rb                           |  112 +-
 app/models/repository/bazaar.rb                    |   42 +-
 app/models/repository/cvs.rb                       |   35 +-
 app/models/repository/darcs.rb                     |    5 +-
 app/models/repository/filesystem.rb                |    6 +-
 app/models/repository/git.rb                       |   45 +-
 app/models/repository/mercurial.rb                 |   21 +-
 app/models/repository/subversion.rb                |   29 +-
 app/models/role.rb                                 |   60 +-
 app/models/setting.rb                              |   96 +-
 app/models/time_entry.rb                           |   35 +-
 app/models/time_entry_activity.rb                  |   10 +-
 app/models/time_entry_activity_custom_field.rb     |    2 +-
 app/models/time_entry_custom_field.rb              |    2 +-
 app/models/time_entry_query.rb                     |  124 +
 app/models/token.rb                                |   36 +-
 app/models/tracker.rb                              |   71 +-
 app/models/user.rb                                 |  341 +-
 app/models/user_custom_field.rb                    |    2 +-
 app/models/user_preference.rb                      |   13 +-
 app/models/version.rb                              |   61 +-
 app/models/version_custom_field.rb                 |    2 +-
 app/models/watcher.rb                              |   19 +-
 app/models/wiki.rb                                 |    8 +-
 app/models/wiki_content.rb                         |   53 +-
 app/models/wiki_content_observer.rb                |   28 -
 app/models/wiki_page.rb                            |   40 +-
 app/models/wiki_redirect.rb                        |    2 +-
 app/models/workflow.rb                             |   89 -
 app/models/workflow_permission.rb                  |   45 +
 app/models/workflow_rule.rb                        |   73 +
 app/models/workflow_transition.rb                  |   39 +
 app/views/account/login.html.erb                   |   29 +-
 app/views/account/logout.html.erb                  |    3 +
 app/views/account/lost_password.html.erb           |   16 +-
 app/views/account/password_recovery.html.erb       |   23 +-
 app/views/account/register.html.erb                |    2 +-
 app/views/activities/index.html.erb                |   29 +-
 app/views/admin/_menu.html.erb                     |    4 +-
 app/views/admin/_no_data.html.erb                  |    2 +-
 app/views/admin/info.html.erb                      |   10 +-
 app/views/admin/plugins.html.erb                   |    8 +-
 app/views/admin/projects.html.erb                  |   16 +-
 app/views/attachments/_form.html.erb               |   37 +-
 app/views/attachments/_links.html.erb              |   12 +-
 app/views/attachments/destroy.js.erb               |    1 +
 app/views/attachments/diff.html.erb                |   16 +-
 app/views/attachments/upload.js.erb                |   14 +
 app/views/auth_sources/_form.html.erb              |   13 +-
 .../auth_sources/_form_auth_source_ldap.html.erb   |   61 +-
 app/views/auth_sources/edit.html.erb               |    6 +-
 app/views/auth_sources/index.html.erb              |   18 +-
 app/views/auth_sources/new.html.erb                |    6 +-
 app/views/auto_completes/issues.html.erb           |   16 +-
 app/views/boards/_form.html.erb                    |    3 +
 app/views/boards/edit.html.erb                     |    2 +-
 app/views/boards/index.html.erb                    |   14 +-
 app/views/boards/new.html.erb                      |    2 +-
 app/views/boards/show.html.erb                     |   37 +-
 app/views/calendars/show.html.erb                  |    5 +-
 app/views/common/_diff.html.erb                    |   13 +-
 app/views/common/_file.html.erb                    |    4 +-
 app/views/common/_preview.html.erb                 |    2 +-
 app/views/common/_tabs.html.erb                    |    6 +-
 app/views/common/error.html.erb                    |    2 +-
 app/views/common/feed.atom.builder                 |    4 +-
 app/views/context_menus/issues.html.erb            |   81 +-
 app/views/context_menus/time_entries.html.erb      |    2 +-
 app/views/custom_fields/_form.html.erb             |  189 +-
 app/views/custom_fields/_index.html.erb            |   21 +-
 app/views/custom_fields/edit.html.erb              |    9 +-
 app/views/custom_fields/index.api.rsb              |   42 +
 app/views/custom_fields/index.html.erb             |    4 +-
 app/views/custom_fields/new.html.erb               |   19 +-
 app/views/custom_fields/new.js.erb                 |    1 +
 app/views/documents/edit.html.erb                  |    2 +-
 app/views/documents/index.html.erb                 |   22 +-
 app/views/documents/new.html.erb                   |    2 +-
 app/views/documents/show.html.erb                  |   16 +-
 app/views/enumerations/destroy.html.erb            |    6 +-
 app/views/enumerations/edit.html.erb               |    4 +-
 app/views/enumerations/index.api.rsb               |    9 +
 app/views/enumerations/index.html.erb              |   23 +-
 app/views/enumerations/new.html.erb                |    4 +-
 app/views/files/index.html.erb                     |    6 +-
 app/views/files/new.html.erb                       |    2 +-
 app/views/gantts/show.html.erb                     |  355 +-
 app/views/groups/_form.html.erb                    |    2 +-
 app/views/groups/_general.html.erb                 |    2 +-
 app/views/groups/_memberships.html.erb             |   26 +-
 app/views/groups/_users.html.erb                   |   26 +-
 app/views/groups/add_users.js.erb                  |    4 +
 app/views/groups/autocomplete_for_user.html.erb    |    1 -
 app/views/groups/autocomplete_for_user.js.erb      |    1 +
 app/views/groups/destroy_membership.js.erb         |    1 +
 app/views/groups/edit.html.erb                     |    4 +-
 app/views/groups/edit_membership.js.erb            |    6 +
 app/views/groups/index.api.rsb                     |   10 +
 app/views/groups/index.html.erb                    |    9 +-
 app/views/groups/new.html.erb                      |    4 +-
 app/views/groups/remove_user.js.erb                |    1 +
 app/views/groups/show.api.rsb                      |   30 +
 app/views/groups/show.html.erb                     |    2 +-
 app/views/issue_categories/_new_modal.html.erb     |    9 +
 app/views/issue_categories/create.js.erb           |    3 +
 app/views/issue_categories/destroy.html.erb        |    2 +-
 app/views/issue_categories/edit.html.erb           |    3 +-
 app/views/issue_categories/new.html.erb            |    3 +-
 app/views/issue_categories/new.js.erb              |    2 +
 app/views/issue_relations/_form.html.erb           |    5 +-
 app/views/issue_relations/create.js.erb            |    7 +
 app/views/issue_relations/destroy.js.erb           |    1 +
 app/views/issue_statuses/edit.html.erb             |    4 +-
 app/views/issue_statuses/index.html.erb            |   17 +-
 app/views/issue_statuses/new.html.erb              |    4 +-
 app/views/issues/_action_menu.html.erb             |   10 +-
 app/views/issues/_attributes.html.erb              |   59 +-
 app/views/issues/_conflict.html.erb                |    4 +-
 app/views/issues/_edit.html.erb                    |   25 +-
 app/views/issues/_form.html.erb                    |   23 +-
 app/views/issues/_form_custom_fields.html.erb      |    7 +-
 app/views/issues/_history.html.erb                 |    5 +-
 app/views/issues/_list.html.erb                    |   40 +-
 app/views/issues/_list_simple.html.erb             |    6 +-
 app/views/issues/_relations.html.erb               |   45 +-
 app/views/issues/_sidebar.html.erb                 |   14 +-
 app/views/issues/bulk_edit.html.erb                |  163 +-
 app/views/issues/bulk_edit.js.erb                  |    1 +
 app/views/issues/destroy.html.erb                  |    6 +-
 app/views/issues/index.api.rsb                     |    3 +-
 app/views/issues/index.html.erb                    |   17 +-
 app/views/issues/new.html.erb                      |   32 +-
 app/views/issues/show.api.rsb                      |   13 +-
 app/views/issues/show.html.erb                     |   78 +-
 app/views/issues/update_form.js.erb                |    7 +
 app/views/journals/_notes_form.html.erb            |   18 +-
 app/views/journals/diff.html.erb                   |    7 +-
 app/views/journals/edit.js.erb                     |    8 +
 app/views/journals/edit.rjs                        |    3 -
 app/views/journals/new.js.erb                      |   10 +
 app/views/journals/update.js.erb                   |    9 +
 app/views/journals/update.rjs                      |   10 -
 app/views/layouts/base.html.erb                    |   30 +-
 app/views/layouts/mailer.html.erb                  |    7 +-
 app/views/layouts/mailer.text.erb                  |    4 +
 app/views/mailer/_issue.html.erb                   |   21 +-
 app/views/mailer/_issue.text.erb                   |   18 +-
 app/views/mailer/issue_add.html.erb                |    2 +-
 app/views/mailer/issue_add.text.erb                |    2 +-
 app/views/mailer/issue_edit.html.erb               |    7 +-
 app/views/mailer/issue_edit.text.erb               |   11 +-
 app/views/mailer/wiki_content_added.html.erb       |    2 +-
 app/views/mailer/wiki_content_updated.html.erb     |    2 +-
 app/views/members/autocomplete.html.erb            |    1 -
 app/views/members/autocomplete.js.erb              |    1 +
 app/views/members/create.js.erb                    |   11 +
 app/views/members/destroy.js.erb                   |    2 +
 app/views/members/update.js.erb                    |    3 +
 app/views/messages/_form.html.erb                  |    6 +-
 app/views/messages/edit.html.erb                   |   31 +-
 app/views/messages/new.html.erb                    |   10 +-
 app/views/messages/quote.js.erb                    |    4 +
 app/views/messages/show.html.erb                   |   42 +-
 app/views/my/_block.html.erb                       |    6 +-
 app/views/my/_sidebar.html.erb                     |    4 +-
 app/views/my/account.html.erb                      |    3 +-
 app/views/my/blocks/_calendar.html.erb             |    4 +-
 app/views/my/blocks/_documents.html.erb            |    8 +-
 app/views/my/blocks/_issuesassignedtome.html.erb   |   19 +-
 app/views/my/blocks/_issuesreportedbyme.html.erb   |   20 +-
 app/views/my/blocks/_issueswatched.html.erb        |   15 +-
 app/views/my/blocks/_news.html.erb                 |    7 +-
 app/views/my/blocks/_timelog.html.erb              |   18 +-
 app/views/my/destroy.html.erb                      |    6 +-
 app/views/my/page_layout.html.erb                  |   90 +-
 app/views/my/password.html.erb                     |    6 +-
 app/views/news/_form.html.erb                      |    2 +-
 app/views/news/edit.html.erb                       |    9 +-
 app/views/news/index.html.erb                      |   13 +-
 app/views/news/new.html.erb                        |    9 +-
 app/views/news/show.html.erb                       |   25 +-
 app/views/previews/issue.html.erb                  |    4 +-
 app/views/projects/_edit.html.erb                  |    2 +-
 app/views/projects/_form.html.erb                  |   50 +-
 app/views/projects/copy.html.erb                   |    2 +-
 app/views/projects/destroy.html.erb                |    9 +-
 app/views/projects/index.html.erb                  |   16 +-
 app/views/projects/new.html.erb                    |    6 +-
 app/views/projects/settings/_activities.html.erb   |   16 +-
 app/views/projects/settings/_boards.html.erb       |   12 +-
 .../projects/settings/_issue_categories.html.erb   |    8 +-
 app/views/projects/settings/_members.html.erb      |  102 +-
 app/views/projects/settings/_modules.html.erb      |    8 +-
 app/views/projects/settings/_repositories.html.erb |   14 +-
 app/views/projects/settings/_versions.html.erb     |    4 +-
 app/views/projects/settings/_wiki.html.erb         |    6 +-
 app/views/projects/show.html.erb                   |   39 +-
 app/views/queries/_columns.html.erb                |    6 +-
 app/views/queries/_filters.html.erb                |   59 +-
 app/views/queries/_form.html.erb                   |   43 +-
 app/views/queries/edit.html.erb                    |    2 +-
 app/views/queries/index.api.rsb                    |    2 +-
 app/views/queries/index.html.erb                   |    8 +-
 app/views/queries/new.html.erb                     |    2 +-
 app/views/reports/_details.html.erb                |   46 +-
 app/views/reports/_simple.html.erb                 |   36 +-
 app/views/reports/issue_report.html.erb            |   14 +-
 app/views/reports/issue_report_details.html.erb    |    2 +-
 app/views/repositories/_breadcrumbs.html.erb       |    6 +-
 app/views/repositories/_dir_list_content.html.erb  |   23 +-
 app/views/repositories/_form.html.erb              |   15 +-
 app/views/repositories/_link_to_functions.html.erb |    6 +-
 app/views/repositories/_navigation.html.erb        |    4 +-
 app/views/repositories/_related_issues.html.erb    |   21 +-
 app/views/repositories/_revision_graph.html.erb    |   32 +-
 app/views/repositories/_revisions.html.erb         |   11 +-
 app/views/repositories/add_related_issue.js.erb    |    7 +
 app/views/repositories/annotate.html.erb           |   24 +-
 app/views/repositories/changes.html.erb            |    6 +-
 app/views/repositories/committers.html.erb         |    2 +-
 app/views/repositories/diff.html.erb               |   15 +-
 app/views/repositories/edit.html.erb               |    2 +-
 app/views/repositories/entry.html.erb              |    2 +-
 app/views/repositories/new.html.erb                |    2 +-
 app/views/repositories/new.js.erb                  |    1 +
 app/views/repositories/remove_related_issue.js.erb |    1 +
 app/views/repositories/revision.html.erb           |   10 +-
 app/views/repositories/revisions.html.erb          |    9 +-
 app/views/repositories/stats.html.erb              |   12 +-
 app/views/roles/_form.html.erb                     |    4 +-
 app/views/roles/edit.html.erb                      |    4 +-
 app/views/roles/index.html.erb                     |   13 +-
 app/views/roles/new.html.erb                       |    4 +-
 app/views/roles/permissions.html.erb               |    8 +-
 app/views/roles/show.api.rsb                       |    9 +
 app/views/search/index.html.erb                    |   26 +-
 app/views/settings/_authentication.html.erb        |    4 +-
 app/views/settings/_display.html.erb               |   12 +-
 app/views/settings/_general.html.erb               |    2 +-
 app/views/settings/_issues.html.erb                |   14 +-
 app/views/settings/_mail_handler.html.erb          |   11 +-
 app/views/settings/_notifications.html.erb         |    2 +-
 app/views/settings/_projects.html.erb              |    5 +-
 app/views/settings/_repositories.html.erb          |  104 +-
 app/views/settings/plugin.html.erb                 |    6 +-
 app/views/timelog/_date_range.html.erb             |   58 +-
 app/views/timelog/_form.html.erb                   |   43 +-
 app/views/timelog/_list.html.erb                   |   68 +-
 app/views/timelog/_report_criteria.html.erb        |    2 +-
 app/views/timelog/bulk_edit.html.erb               |   14 +-
 app/views/timelog/edit.html.erb                    |    2 +-
 app/views/timelog/index.html.erb                   |   21 +-
 app/views/timelog/new.html.erb                     |    2 +-
 app/views/timelog/report.html.erb                  |   12 +-
 app/views/trackers/_form.html.erb                  |   17 +-
 app/views/trackers/edit.html.erb                   |    4 +-
 app/views/trackers/fields.html.erb                 |   75 +
 app/views/trackers/index.html.erb                  |   20 +-
 app/views/trackers/new.html.erb                    |    4 +-
 app/views/users/_form.html.erb                     |   18 +-
 app/views/users/_general.html.erb                  |    2 +-
 app/views/users/_groups.html.erb                   |    2 +-
 app/views/users/_mail_notifications.html.erb       |   33 +-
 app/views/users/_memberships.html.erb              |   21 +-
 app/views/users/_preferences.html.erb              |    5 +-
 app/views/users/destroy_membership.js.erb          |    1 +
 app/views/users/edit.html.erb                      |    6 +-
 app/views/users/edit_membership.js.erb             |    6 +
 app/views/users/index.html.erb                     |   14 +-
 app/views/users/new.html.erb                       |   22 +-
 app/views/users/show.api.rsb                       |   10 +-
 app/views/users/show.html.erb                      |    2 +-
 app/views/versions/_issue_counts.html.erb          |   20 +-
 app/views/versions/_new_modal.html.erb             |    2 +-
 app/views/versions/_overview.html.erb              |   23 +-
 app/views/versions/create.js.erb                   |    3 +
 app/views/versions/edit.html.erb                   |    2 +-
 app/views/versions/index.api.rsb                   |    1 +
 app/views/versions/index.html.erb                  |   97 +-
 app/views/versions/new.html.erb                    |    2 +-
 app/views/versions/new.js.erb                      |    2 +
 app/views/versions/show.api.rsb                    |    1 +
 app/views/versions/show.html.erb                   |    9 +-
 app/views/versions/status_by.js.erb                |    1 +
 app/views/watchers/_new.html.erb                   |   29 +-
 app/views/watchers/_set_watcher.js.erb             |    2 +
 app/views/watchers/_watchers.html.erb              |   11 +-
 app/views/watchers/append.js.erb                   |    4 +
 app/views/watchers/create.js.erb                   |    2 +
 app/views/watchers/destroy.js.erb                  |    1 +
 app/views/watchers/new.js.erb                      |    3 +
 app/views/welcome/index.html.erb                   |    1 -
 app/views/wiki/_sidebar.html.erb                   |   11 +-
 app/views/wiki/annotate.html.erb                   |   13 +-
 app/views/wiki/date_index.html.erb                 |    2 +-
 app/views/wiki/destroy.html.erb                    |    4 +-
 app/views/wiki/diff.html.erb                       |    4 +-
 app/views/wiki/edit.html.erb                       |   21 +-
 app/views/wiki/history.html.erb                    |   17 +-
 app/views/wiki/index.api.rsb                       |   13 +
 app/views/wiki/index.html.erb                      |    2 +-
 app/views/wiki/rename.html.erb                     |    4 +-
 app/views/wiki/show.api.rsb                        |   18 +
 app/views/wiki/show.html.erb                       |   42 +-
 app/views/wikis/destroy.html.erb                   |    2 +-
 app/views/wikis/edit.js.erb                        |    1 +
 app/views/workflows/_action_menu.html.erb          |    1 -
 app/views/workflows/_form.html.erb                 |   15 +-
 app/views/workflows/copy.html.erb                  |   18 +-
 app/views/workflows/edit.html.erb                  |   26 +-
 app/views/workflows/index.html.erb                 |    8 +-
 app/views/workflows/permissions.html.erb           |  106 +
 config.ru                                          |    4 +
 config/application.rb                              |   59 +
 config/boot.rb                                     |  126 +-
 config/configuration.yml.example                   |   56 +-
 config/database.yml.example                        |   47 +-
 config/environment.rb                              |   69 +-
 config/environments/development.rb                 |   27 +-
 config/environments/production.rb                  |   50 +-
 config/environments/test.rb                        |   43 +-
 config/initializers/00-core_plugins.rb             |   15 +
 config/initializers/10-patches.rb                  |  234 +-
 config/initializers/20-mime_types.rb               |    3 +-
 config/initializers/30-redmine.rb                  |   21 +-
 config/locales/ar.yml                              |  416 +-
 config/locales/az.yml                              | 1200 ++++
 config/locales/bg.yml                              |  112 +-
 config/locales/bs.yml                              |  107 +-
 config/locales/ca.yml                              |  100 +-
 config/locales/cs.yml                              |  366 +-
 config/locales/da.yml                              |  100 +-
 config/locales/de.yml                              | 1742 +++---
 config/locales/el.yml                              |  102 +-
 config/locales/en-GB.yml                           |  104 +-
 config/locales/en.yml                              |  117 +-
 config/locales/es.yml                              |  162 +-
 config/locales/et.yml                              | 1317 +++--
 config/locales/eu.yml                              |  100 +-
 config/locales/fa.yml                              |   98 +-
 config/locales/fi.yml                              |  100 +-
 config/locales/fr.yml                              |  110 +-
 config/locales/gl.yml                              |  100 +-
 config/locales/he.yml                              |   98 +-
 config/locales/hr.yml                              |  108 +-
 config/locales/hu.yml                              |  100 +-
 config/locales/id.yml                              |  102 +-
 config/locales/it.yml                              |  152 +-
 config/locales/ja.yml                              |  227 +-
 config/locales/ko.yml                              |  219 +-
 config/locales/lt.yml                              |  821 +--
 config/locales/lv.yml                              |  102 +-
 config/locales/mk.yml                              |  102 +-
 config/locales/mn.yml                              |  103 +-
 config/locales/nl.yml                              |  203 +-
 config/locales/no.yml                              |  170 +-
 config/locales/pl.yml                              |  279 +-
 config/locales/pt-BR.yml                           |  254 +-
 config/locales/pt.yml                              |  313 +-
 config/locales/ro.yml                              |  100 +-
 config/locales/ru.yml                              |  239 +-
 config/locales/sk.yml                              | 1078 ++--
 config/locales/sl.yml                              |  144 +-
 config/locales/sq.yml                              |  104 +-
 config/locales/sr-YU.yml                           |  168 +-
 config/locales/sr.yml                              |  102 +-
 config/locales/sv.yml                              |  148 +-
 config/locales/th.yml                              |   96 +-
 config/locales/tr.yml                              |   98 +-
 config/locales/uk.yml                              |   96 +-
 config/locales/vi.yml                              |  862 +--
 config/locales/zh-TW.yml                           |  110 +-
 config/locales/zh.yml                              |   97 +-
 config/routes.rb                                   |  708 ++-
 config/settings.yml                                |   54 +-
 db/migrate/001_setup.rb                            |    3 +-
 db/migrate/002_issue_move.rb                       |    2 +-
 db/migrate/003_issue_add_note.rb                   |    2 +-
 db/migrate/004_export_pdf.rb                       |    4 +-
 db/migrate/006_calendar_and_activity.rb            |    6 +-
 db/migrate/007_create_journals.rb                  |    4 +-
 db/migrate/012_add_comments_permissions.rb         |    4 +-
 db/migrate/014_add_queries_permissions.rb          |    2 +-
 db/migrate/016_add_repositories_permissions.rb     |   12 +-
 db/migrate/019_add_issue_status_position.rb        |    2 +-
 db/migrate/021_add_tracker_position.rb             |    2 +-
 db/migrate/022_serialize_possibles_values.rb       |    2 +-
 db/migrate/024_add_roadmap_permission.rb           |    2 +-
 db/migrate/065_add_settings_updated_on.rb          |    2 +-
 db/migrate/068_create_enabled_modules.rb           |    2 +-
 db/migrate/072_add_enumerations_position.rb        |    2 +-
 db/migrate/078_add_custom_fields_position.rb       |    2 +-
 db/migrate/081_create_projects_trackers.rb         |    4 +-
 .../091_change_changesets_revision_to_string.rb    |   23 +
 db/migrate/096_add_commit_access_permission.rb     |    4 +-
 db/migrate/097_add_view_wiki_edits_permission.rb   |    4 +-
 ...add_delete_wiki_pages_attachments_permission.rb |    4 +-
 db/migrate/105_build_projects_tree.rb              |    2 +-
 ...312194159_add_projects_trackers_unique_index.rb |    2 +-
 db/migrate/20090503121505_populate_member_roles.rb |    2 +-
 .../20091114105931_add_view_issues_permission.rb   |    4 +-
 ...calendar_and_gantt_modules_where_appropriate.rb |    2 +-
 ...0220160626_add_workflows_assignee_and_author.rb |    5 +-
 ...120422150750_change_repositories_to_full_sti.rb |   17 +
 .../20120705074331_add_trackers_fields_bits.rb     |    9 +
 .../20120707064544_add_auth_sources_timeout.rb     |    9 +
 db/migrate/20120714122000_add_workflows_type.rb    |    9 +
 .../20120714122100_update_workflows_to_sti.rb      |    9 +
 .../20120714122200_add_workflows_rule_fields.rb    |   11 +
 db/migrate/20120731164049_add_boards_parent_id.rb  |    9 +
 .../20120930112914_add_journals_private_notes.rb   |    9 +
 ...0121026002032_add_enumerations_position_name.rb |    9 +
 ...26003537_populate_enumerations_position_name.rb |    9 +
 db/migrate/20121209123234_add_queries_type.rb      |    9 +
 db/migrate/20121209123358_update_queries_to_sti.rb |    9 +
 ...0121213084931_add_attachments_disk_directory.rb |    9 +
 .../20130110122628_split_documents_permissions.rb  |   23 +
 ...30201184705_add_unique_index_on_tokens_value.rb |   15 +
 .../20130202090625_add_projects_inherit_members.rb |    9 +
 ...6_add_unique_index_on_custom_fields_trackers.rb |   24 +
 ...5_add_unique_index_on_custom_fields_projects.rb |   24 +
 ...15073721_change_users_lastname_length_to_255.rb |    9 +
 db/migrate/20130215111127_add_issues_closed_on.rb  |    9 +
 .../20130215111141_populate_issues_closed_on.rb    |   25 +
 ...130217094251_remove_issues_default_fk_values.rb |   19 +
 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/NEWS                                        |   19 +
 debian/README.Debian                               |    2 +-
 debian/changelog                                   |  185 +-
 debian/control                                     |   46 +-
 debian/copyright                                   |    2 +-
 debian/gbp.conf                                    |    5 +-
 debian/install                                     |    9 +-
 debian/patches/2002_FHS_through_env_vars.patch     |  148 +-
 .../patches/2003_externalize_session_config.patch  |   82 +-
 debian/patches/2004_FHS_plugins_assets.patch       |   28 +-
 debian/patches/2005_FHS_schema_dump.patch          |   16 -
 .../patches/2008_force_table_encoding_mysql.patch  |   13 +-
 debian/patches/2009_FHS_thin_config.patch          |    6 +-
 debian/patches/2017_Gemfile_debian.patch           |  190 +-
 debian/patches/2018_get_rid_of_rdoctask.patch      |   40 +
 debian/patches/2019_unplug_bundler.patch           |   81 +
 debian/patches/changeset_r11680.diff               |   14 +
 debian/patches/series                              |    3 +-
 debian/postinst                                    |   31 +-
 debian/rules                                       |   28 +-
 doc/CHANGELOG                                      |  621 +-
 doc/INSTALL                                        |   34 +-
 doc/README_FOR_APP                                 |   23 +
 doc/RUNNING_TESTS                                  |   49 +-
 doc/UPGRADING                                      |   19 +-
 extra/mail_handler/rdm-mailhandler.rb              |   63 +-
 extra/sample_plugin/README                         |    7 +-
 .../app/views/example/say_goodbye.html.erb         |    4 +-
 .../app/views/example/say_hello.html.erb           |   10 +-
 extra/sample_plugin/config/routes.rb               |    7 +
 extra/sample_plugin/init.rb                        |    5 +-
 .../sample_plugin/test/integration/routing_test.rb |   12 +
 extra/svn/Redmine.pm                               |  143 +-
 lib/SVG/Graph/Bar.rb                               |  296 +-
 lib/SVG/Graph/BarBase.rb                           |  278 +-
 lib/SVG/Graph/BarHorizontal.rb                     |  298 +-
 lib/SVG/Graph/Graph.rb                             | 1955 ++++---
 lib/SVG/Graph/Pie.rb                               |  790 +--
 lib/SVG/Graph/Plot.rb                              | 1000 ++--
 lib/SVG/Graph/TimeSeries.rb                        |  479 +-
 lib/generators/redmine_plugin/USAGE                |   39 +-
 .../redmine_plugin/redmine_plugin_generator.rb     |   51 +-
 .../redmine_plugin/templates/en_rails_i18n.yml     |    2 +-
 .../redmine_plugin/templates/init.rb.erb           |    2 -
 lib/generators/redmine_plugin/templates/routes.rb  |    2 +
 .../redmine_plugin/templates/test_helper.rb.erb    |    7 +-
 lib/generators/redmine_plugin_controller/USAGE     |    2 +-
 .../redmine_plugin_controller_generator.rb         |   64 +-
 .../templates/controller.rb.erb                    |    2 +-
 .../templates/functional_test.rb.erb               |    4 +-
 .../templates/helper.rb.erb                        |    2 +-
 .../templates/view.html.erb                        |    2 +-
 lib/generators/redmine_plugin_model/USAGE          |    2 +-
 .../redmine_plugin_model_generator.rb              |   70 +-
 .../redmine_plugin_model/templates/fixtures.yml    |   11 -
 .../redmine_plugin_model/templates/migration.rb    |   15 +
 .../templates/migration.rb.erb                     |   13 -
 .../redmine_plugin_model/templates/model.rb.erb    |    2 +-
 .../templates/unit_test.rb.erb                     |    5 +-
 .../plugins/acts_as_activity_provider/init.rb      |    0
 .../lib/acts_as_activity_provider.rb               |   88 +
 {vendor => lib}/plugins/acts_as_attachable/init.rb |    0
 .../acts_as_attachable/lib/acts_as_attachable.rb   |  115 +
 .../plugins/acts_as_customizable/init.rb           |    0
 .../lib/acts_as_customizable.rb                    |  168 +
 {vendor => lib}/plugins/acts_as_event/init.rb      |    0
 lib/plugins/acts_as_event/lib/acts_as_event.rb     |   96 +
 {vendor => lib}/plugins/acts_as_list/README        |    0
 {vendor => lib}/plugins/acts_as_list/init.rb       |    0
 .../acts_as_list/lib/active_record/acts/list.rb    |  279 +
 .../plugins/acts_as_list/test/list_test.rb         |    0
 {vendor => lib}/plugins/acts_as_searchable/init.rb |    0
 .../acts_as_searchable/lib/acts_as_searchable.rb   |  135 +
 {vendor => lib}/plugins/acts_as_tree/README        |    0
 {vendor => lib}/plugins/acts_as_tree/Rakefile      |    0
 {vendor => lib}/plugins/acts_as_tree/init.rb       |    0
 .../acts_as_tree/lib/active_record/acts/tree.rb    |  107 +
 .../plugins/acts_as_tree/test/abstract_unit.rb     |    0
 .../plugins/acts_as_tree/test/acts_as_tree_test.rb |    0
 .../plugins/acts_as_tree/test/database.yml         |    0
 .../plugins/acts_as_tree/test/fixtures/mixin.rb    |    0
 .../plugins/acts_as_tree/test/fixtures/mixins.yml  |    0
 .../plugins/acts_as_tree/test/schema.rb            |    0
 .../plugins/acts_as_versioned/CHANGELOG            |    0
 .../plugins/acts_as_versioned/MIT-LICENSE          |    0
 {vendor => lib}/plugins/acts_as_versioned/README   |    0
 .../plugins/acts_as_versioned/RUNNING_UNIT_TESTS   |    0
 {vendor => lib}/plugins/acts_as_versioned/Rakefile |    0
 {vendor => lib}/plugins/acts_as_versioned/init.rb  |    0
 .../acts_as_versioned/lib/acts_as_versioned.rb     |  568 ++
 .../acts_as_versioned/test/abstract_unit.rb        |    0
 .../plugins/acts_as_versioned/test/database.yml    |    0
 .../acts_as_versioned/test/fixtures/authors.yml    |    0
 .../acts_as_versioned/test/fixtures/landmark.rb    |    0
 .../test/fixtures/landmark_versions.yml            |    0
 .../acts_as_versioned/test/fixtures/landmarks.yml  |    0
 .../test/fixtures/locked_pages.yml                 |    0
 .../test/fixtures/locked_pages_revisions.yml       |    0
 .../fixtures/migrations/1_add_versioned_tables.rb  |    0
 .../acts_as_versioned/test/fixtures/page.rb        |    0
 .../test/fixtures/page_versions.yml                |    0
 .../acts_as_versioned/test/fixtures/pages.yml      |    0
 .../acts_as_versioned/test/fixtures/widget.rb      |    0
 .../acts_as_versioned/test/migration_test.rb       |    0
 .../plugins/acts_as_versioned/test/schema.rb       |    0
 .../acts_as_versioned/test/versioned_test.rb       |    0
 {vendor => lib}/plugins/acts_as_watchable/init.rb  |    0
 .../acts_as_watchable/lib/acts_as_watchable.rb     |   88 +
 lib/plugins/awesome_nested_set/.autotest           |   13 +
 lib/plugins/awesome_nested_set/.travis.yml         |   14 +
 lib/plugins/awesome_nested_set/CHANGELOG           |   14 +
 lib/plugins/awesome_nested_set/MIT-LICENSE         |   20 +
 lib/plugins/awesome_nested_set/README.rdoc         |  100 +
 lib/plugins/awesome_nested_set/Rakefile            |   28 +
 .../awesome_nested_set/awesome_nested_set.gemspec  |   22 +
 lib/plugins/awesome_nested_set/init.rb             |    1 +
 .../awesome_nested_set/lib/awesome_nested_set.rb   |    7 +
 .../lib/awesome_nested_set/awesome_nested_set.rb   |  601 ++
 .../lib/awesome_nested_set/helper.rb               |   44 +
 .../lib/awesome_nested_set/version.rb              |    3 +
 .../plugins/awesome_nested_set/rails/init.rb       |    0
 .../spec/awesome_nested_set/helper_spec.rb         |   67 +
 .../spec/awesome_nested_set_spec.rb                |  841 +++
 .../awesome_nested_set/spec/db/database.yml        |   18 +
 lib/plugins/awesome_nested_set/spec/db/schema.rb   |   45 +
 .../awesome_nested_set/spec/fixtures/brokens.yml   |    3 +
 .../spec/fixtures/categories.yml                   |   34 +
 .../spec/fixtures/departments.yml                  |    3 +
 .../awesome_nested_set/spec/fixtures/notes.yml     |   38 +
 .../awesome_nested_set/spec/fixtures/things.yml    |   27 +
 lib/plugins/awesome_nested_set/spec/spec_helper.rb |   32 +
 .../awesome_nested_set/spec/support/models.rb      |   72 +
 .../test/awesome_nested_set/helper_test.rb         |    0
 .../test/awesome_nested_set_test.rb                |  603 ++
 .../awesome_nested_set/test/db/database.yml        |    0
 .../plugins/awesome_nested_set/test/db/schema.rb   |    0
 .../test/fixtures/categories.yml                   |    0
 .../awesome_nested_set/test/fixtures/category.rb   |    0
 .../test/fixtures/departments.yml                  |    0
 .../awesome_nested_set/test/fixtures/notes.yml     |    0
 .../plugins/awesome_nested_set/test/test_helper.rb |    0
 {vendor => lib}/plugins/gravatar/.gitignore        |    0
 {vendor => lib}/plugins/gravatar/MIT-LICENSE       |    0
 {vendor => lib}/plugins/gravatar/README.rdoc       |    0
 {vendor => lib}/plugins/gravatar/Rakefile          |    0
 {vendor => lib}/plugins/gravatar/about.yml         |    0
 {vendor => lib}/plugins/gravatar/init.rb           |    0
 {vendor => lib}/plugins/gravatar/lib/gravatar.rb   |    0
 .../plugins/gravatar/spec/gravatar_spec.rb         |    0
 lib/plugins/open_id_authentication/CHANGELOG       |   37 +
 lib/plugins/open_id_authentication/README          |  223 +
 .../plugins/open_id_authentication/Rakefile        |    0
 .../open_id_authentication_tables_generator.rb     |    0
 .../templates/migration.rb                         |    0
 .../templates/migration.rb                         |    0
 ...rade_open_id_authentication_tables_generator.rb |    0
 lib/plugins/open_id_authentication/init.rb         |   12 +
 .../lib/open_id_authentication.rb                  |  159 +
 .../lib/open_id_authentication/association.rb      |    9 +
 .../lib/open_id_authentication/db_store.rb         |    0
 .../lib/open_id_authentication/mem_cache_store.rb  |    0
 .../lib/open_id_authentication/nonce.rb            |    5 +
 .../lib/open_id_authentication/request.rb          |    0
 .../lib/open_id_authentication/timeout_fixes.rb    |    0
 .../lib/tasks/open_id_authentication_tasks.rake    |    0
 .../test/mem_cache_store_test.rb                   |    0
 .../open_id_authentication/test/normalize_test.rb  |    0
 .../test/open_id_authentication_test.rb            |    0
 .../open_id_authentication/test/status_test.rb     |    0
 .../open_id_authentication/test/test_helper.rb     |   17 +
 {vendor => lib}/plugins/rfpdf/CHANGELOG            |    0
 {vendor => lib}/plugins/rfpdf/MIT-LICENSE          |    0
 lib/plugins/rfpdf/README                           |   41 +
 lib/plugins/rfpdf/init.rb                          |    6 +
 .../plugins/rfpdf/lib/config/lang/eng.rb           |    0
 .../plugins/rfpdf/lib/core/image_science.rb        |    0
 {vendor => lib}/plugins/rfpdf/lib/core/rfpdf.rb    |    0
 lib/plugins/rfpdf/lib/core/rmagick.rb              |   64 +
 .../plugins/rfpdf/lib/fonts/ttf2ufm/README.TXT     |    0
 .../rfpdf/lib/fonts/ttf2ufm/makefontuni_ruby.php   |    0
 {vendor => lib}/plugins/rfpdf/lib/fpdf/bookmark.rb |    0
 {vendor => lib}/plugins/rfpdf/lib/fpdf/chinese.rb  |    0
 {vendor => lib}/plugins/rfpdf/lib/fpdf/japanese.rb |    0
 {vendor => lib}/plugins/rfpdf/lib/fpdf/korean.rb   |    0
 {vendor => lib}/plugins/rfpdf/lib/fpdf/makefont.rb |    0
 {vendor => lib}/plugins/rfpdf/lib/rfpdf.rb         |    0
 .../plugins/rfpdf/lib/rfpdf/action_controller.rb   |    0
 .../plugins/rfpdf/lib/rfpdf/action_view.rb         |    0
 {vendor => lib}/plugins/rfpdf/lib/rfpdf/errors.rb  |    0
 {vendor => lib}/plugins/rfpdf/lib/rfpdf/fpdf.rb    |    0
 {vendor => lib}/plugins/rfpdf/lib/rfpdf/math.rb    |    0
 .../lib/rfpdf/template_handler/compile_support.rb  |    0
 .../rfpdf/lib/rfpdf/template_handlers/base.rb      |    0
 lib/plugins/rfpdf/lib/tcpdf.rb                     | 4349 ++++++++++++++
 {vendor => lib}/plugins/rfpdf/logo_example.png     |  Bin
 {vendor => lib}/plugins/rfpdf/test/test_helper.rb  |    0
 {vendor => lib}/plugins/rfpdf/test_unicode.rfpdf   |    0
 {vendor => lib}/plugins/rfpdf/utf8test.txt         |    0
 lib/redcloth3.rb                                   |   12 +-
 lib/redmine.rb                                     |  136 +-
 lib/redmine/about.rb                               |   16 -
 lib/redmine/access_control.rb                      |   17 +-
 lib/redmine/access_keys.rb                         |    2 +-
 lib/redmine/activity.rb                            |    2 +-
 lib/redmine/activity/fetcher.rb                    |    2 +-
 lib/redmine/ciphering.rb                           |    8 +-
 lib/redmine/codeset_util.rb                        |   22 +-
 lib/redmine/configuration.rb                       |    5 +-
 lib/redmine/core_ext/active_record.rb              |   53 +-
 lib/redmine/core_ext/date/calculations.rb          |    2 +-
 lib/redmine/core_ext/string.rb                     |    4 +
 lib/redmine/core_ext/string/conversions.rb         |    2 +-
 lib/redmine/core_ext/string/inflections.rb         |    2 +-
 lib/redmine/custom_field_format.rb                 |   19 +-
 lib/redmine/default_data/loader.rb                 |   36 +-
 lib/redmine/export/pdf.rb                          |  246 +-
 lib/redmine/helpers/calendar.rb                    |    2 +-
 lib/redmine/helpers/diff.rb                        |   13 +-
 lib/redmine/helpers/gantt.rb                       |  484 +-
 lib/redmine/helpers/time_report.rb                 |   67 +-
 lib/redmine/hook.rb                                |   30 +-
 lib/redmine/i18n.rb                                |  113 +-
 lib/redmine/imap.rb                                |   26 +-
 lib/redmine/info.rb                                |   27 +
 lib/redmine/menu_manager.rb                        |   17 +-
 lib/redmine/mime_type.rb                           |    5 +-
 lib/redmine/pagination.rb                          |  244 +
 lib/redmine/platform.rb                            |    2 +-
 lib/redmine/plugin.rb                              |  222 +-
 lib/redmine/pop3.rb                                |    4 +-
 lib/redmine/safe_attributes.rb                     |    8 +-
 lib/redmine/scm/adapters/abstract_adapter.rb       |   92 +-
 lib/redmine/scm/adapters/bazaar_adapter.rb         |   51 +-
 lib/redmine/scm/adapters/cvs_adapter.rb            |    6 +-
 lib/redmine/scm/adapters/darcs_adapter.rb          |    2 +-
 lib/redmine/scm/adapters/filesystem_adapter.rb     |    4 +-
 lib/redmine/scm/adapters/git_adapter.rb            |    4 +-
 .../scm/adapters/mercurial/redminehelper.py        |    2 -
 lib/redmine/scm/adapters/mercurial_adapter.rb      |    8 +-
 lib/redmine/scm/adapters/subversion_adapter.rb     |   10 +-
 lib/redmine/scm/base.rb                            |    2 +-
 lib/redmine/search.rb                              |    2 +-
 lib/redmine/subclass_factory.rb                    |   11 +-
 lib/redmine/syntax_highlighting.rb                 |    5 +-
 lib/redmine/themes.rb                              |   30 +-
 lib/redmine/thumbnail.rb                           |   55 +
 lib/redmine/unified_diff.rb                        |   83 +-
 lib/redmine/utils.rb                               |   81 +-
 lib/redmine/version.rb                             |   23 +-
 lib/redmine/views/api_template_handler.rb          |   10 +-
 lib/redmine/views/builders.rb                      |   11 +-
 lib/redmine/views/builders/json.rb                 |   21 +-
 lib/redmine/views/builders/structure.rb            |    8 +-
 lib/redmine/views/builders/xml.rb                  |   10 +-
 lib/redmine/views/labelled_form_builder.rb         |   12 +-
 lib/redmine/views/my_page/block.rb                 |    4 +-
 lib/redmine/views/other_formats_builder.rb         |    2 +-
 lib/redmine/wiki_formatting.rb                     |   29 +-
 lib/redmine/wiki_formatting/macros.rb              |  172 +-
 lib/redmine/wiki_formatting/textile/formatter.rb   |    4 +-
 lib/redmine/wiki_formatting/textile/helper.rb      |   12 +-
 lib/tasks/ci.rake                                  |   88 +-
 lib/tasks/ciphering.rake                           |   10 +-
 lib/tasks/deprecated.rake                          |    5 +-
 lib/tasks/email.rake                               |   34 +-
 lib/tasks/fetch_changesets.rake                    |   24 -
 lib/tasks/initializers.rake                        |   30 +-
 lib/tasks/jdbc.rake                                |    8 -
 lib/tasks/load_default_data.rake                   |    5 +-
 lib/tasks/locales.rake                             |   45 +-
 lib/tasks/migrate_from_mantis.rake                 |  350 +-
 lib/tasks/migrate_from_trac.rake                   |  122 +-
 lib/tasks/migrate_plugins.rake                     |   15 -
 lib/tasks/plugins.rake                             |   38 -
 lib/tasks/redmine.rake                             |  110 +-
 lib/tasks/reminder.rake                            |   10 +-
 lib/tasks/testing.rake                             |   10 +-
 lib/tasks/watchers.rake                            |    9 -
 plugins/README                                     |    1 +
 public/dispatch.cgi.example                        |   10 -
 public/dispatch.fcgi.example                       |   40 +-
 public/dispatch.rb.example                         |   10 -
 public/favicon.ico                                 |  Bin 7886 -> 7886 bytes
 public/help/ar/wiki_syntax.html                    |   66 +
 public/help/ar/wiki_syntax_detailed.html           |  287 +
 public/help/az/wiki_syntax.html                    |   66 +
 public/help/az/wiki_syntax_detailed.html           |  287 +
 public/help/bg/wiki_syntax.html                    |   66 +
 public/help/bg/wiki_syntax_detailed.html           |  287 +
 public/help/bs/wiki_syntax.html                    |   66 +
 public/help/bs/wiki_syntax_detailed.html           |  287 +
 public/help/ca/wiki_syntax.html                    |   66 +
 public/help/ca/wiki_syntax_detailed.html           |  287 +
 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           |  287 +
 public/help/de/wiki_syntax.html                    |   66 +
 public/help/de/wiki_syntax_detailed.html           |  287 +
 public/help/el/wiki_syntax.html                    |   66 +
 public/help/el/wiki_syntax_detailed.html           |  287 +
 public/help/en-gb/wiki_syntax.html                 |   66 +
 public/help/en-gb/wiki_syntax_detailed.html        |  287 +
 public/help/en/wiki_syntax.html                    |   66 +
 public/help/en/wiki_syntax_detailed.html           |  287 +
 public/help/es/wiki_syntax.html                    |   66 +
 public/help/es/wiki_syntax_detailed.html           |  287 +
 public/help/et/wiki_syntax.html                    |   66 +
 public/help/et/wiki_syntax_detailed.html           |  287 +
 public/help/eu/wiki_syntax.html                    |   66 +
 public/help/eu/wiki_syntax_detailed.html           |  287 +
 public/help/fa/wiki_syntax.html                    |   66 +
 public/help/fa/wiki_syntax_detailed.html           |  287 +
 public/help/fi/wiki_syntax.html                    |   66 +
 public/help/fi/wiki_syntax_detailed.html           |  287 +
 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           |  287 +
 public/help/he/wiki_syntax.html                    |   66 +
 public/help/he/wiki_syntax_detailed.html           |  287 +
 public/help/hr/wiki_syntax.html                    |   66 +
 public/help/hr/wiki_syntax_detailed.html           |  287 +
 public/help/hu/wiki_syntax.html                    |   66 +
 public/help/hu/wiki_syntax_detailed.html           |  287 +
 public/help/id/wiki_syntax.html                    |   66 +
 public/help/id/wiki_syntax_detailed.html           |  287 +
 public/help/it/wiki_syntax.html                    |   66 +
 public/help/it/wiki_syntax_detailed.html           |  287 +
 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           |  287 +
 public/help/lt/wiki_syntax.html                    |   66 +
 public/help/lt/wiki_syntax_detailed.html           |  287 +
 public/help/lv/wiki_syntax.html                    |   66 +
 public/help/lv/wiki_syntax_detailed.html           |  287 +
 public/help/mk/wiki_syntax.html                    |   66 +
 public/help/mk/wiki_syntax_detailed.html           |  287 +
 public/help/mn/wiki_syntax.html                    |   66 +
 public/help/mn/wiki_syntax_detailed.html           |  287 +
 public/help/nl/wiki_syntax.html                    |   66 +
 public/help/nl/wiki_syntax_detailed.html           |  287 +
 public/help/no/wiki_syntax.html                    |   66 +
 public/help/no/wiki_syntax_detailed.html           |  287 +
 public/help/pl/wiki_syntax.html                    |   66 +
 public/help/pl/wiki_syntax_detailed.html           |  287 +
 public/help/pt-br/wiki_syntax.html                 |   66 +
 public/help/pt-br/wiki_syntax_detailed.html        |  287 +
 public/help/pt/wiki_syntax.html                    |   66 +
 public/help/pt/wiki_syntax_detailed.html           |  287 +
 public/help/ro/wiki_syntax.html                    |   66 +
 public/help/ro/wiki_syntax_detailed.html           |  287 +
 public/help/ru/wiki_syntax.html                    |   66 +
 public/help/ru/wiki_syntax_detailed.html           |  287 +
 public/help/sk/wiki_syntax.html                    |   66 +
 public/help/sk/wiki_syntax_detailed.html           |  287 +
 public/help/sl/wiki_syntax.html                    |   66 +
 public/help/sl/wiki_syntax_detailed.html           |  287 +
 public/help/sq/wiki_syntax.html                    |   66 +
 public/help/sq/wiki_syntax_detailed.html           |  287 +
 public/help/sr-yu/wiki_syntax.html                 |   66 +
 public/help/sr-yu/wiki_syntax_detailed.html        |  287 +
 public/help/sr/wiki_syntax.html                    |   66 +
 public/help/sr/wiki_syntax_detailed.html           |  287 +
 public/help/sv/wiki_syntax.html                    |   66 +
 public/help/sv/wiki_syntax_detailed.html           |  287 +
 public/help/th/wiki_syntax.html                    |   66 +
 public/help/th/wiki_syntax_detailed.html           |  287 +
 public/help/tr/wiki_syntax.html                    |   66 +
 public/help/tr/wiki_syntax_detailed.html           |  287 +
 public/help/uk/wiki_syntax.html                    |   66 +
 public/help/uk/wiki_syntax_detailed.html           |  287 +
 public/help/vi/wiki_syntax.html                    |   66 +
 public/help/vi/wiki_syntax_detailed.html           |  287 +
 public/help/wiki_syntax.html                       |   66 -
 public/help/wiki_syntax_detailed.html              |  281 -
 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           |  287 +
 public/htaccess.fcgi.example                       |    6 -
 public/images/document.png                         |  Bin 333 -> 374 bytes
 public/images/edit.png                             |  Bin 1271 -> 522 bytes
 public/images/folder.png                           |  Bin 970 -> 349 bytes
 public/images/folder_open.png                      |  Bin 973 -> 471 bytes
 public/images/folder_open_add.png                  |  Bin 375 -> 584 bytes
 public/images/folder_open_orange.png               |  Bin 403 -> 585 bytes
 public/images/hourglass.png                        |  Bin 0 -> 744 bytes
 public/images/message.png                          |  Bin 365 -> 383 bytes
 public/images/wiki_edit.png                        |  Bin 464 -> 533 bytes
 public/javascripts/application.js                  |  811 +--
 public/javascripts/attachments.js                  |  188 +
 public/javascripts/calendar/calendar-setup.js      |  200 -
 public/javascripts/calendar/calendar.js            | 1818 ------
 public/javascripts/calendar/lang/calendar-ar.js    |  125 -
 public/javascripts/calendar/lang/calendar-bg.js    |  127 -
 public/javascripts/calendar/lang/calendar-bs.js    |  129 -
 public/javascripts/calendar/lang/calendar-ca.js    |  127 -
 public/javascripts/calendar/lang/calendar-cs.js    |   69 -
 public/javascripts/calendar/lang/calendar-da.js    |  128 -
 public/javascripts/calendar/lang/calendar-de.js    |  128 -
 public/javascripts/calendar/lang/calendar-en-gb.js |  127 -
 public/javascripts/calendar/lang/calendar-en.js    |  127 -
 public/javascripts/calendar/lang/calendar-es.js    |  129 -
 public/javascripts/calendar/lang/calendar-et.js    |  127 -
 public/javascripts/calendar/lang/calendar-eu.js    |  128 -
 public/javascripts/calendar/lang/calendar-fa.js    |  127 -
 public/javascripts/calendar/lang/calendar-fi.js    |  127 -
 public/javascripts/calendar/lang/calendar-fr.js    |  129 -
 public/javascripts/calendar/lang/calendar-gl.js    |  128 -
 public/javascripts/calendar/lang/calendar-he.js    |  127 -
 public/javascripts/calendar/lang/calendar-hr.js    |  128 -
 public/javascripts/calendar/lang/calendar-hu.js    |  127 -
 public/javascripts/calendar/lang/calendar-id.js    |  130 -
 public/javascripts/calendar/lang/calendar-it.js    |  130 -
 public/javascripts/calendar/lang/calendar-ja.js    |   87 -
 public/javascripts/calendar/lang/calendar-ko.js    |  127 -
 public/javascripts/calendar/lang/calendar-lt.js    |  128 -
 public/javascripts/calendar/lang/calendar-lv.js    |  127 -
 public/javascripts/calendar/lang/calendar-mk.js    |  128 -
 public/javascripts/calendar/lang/calendar-mn.js    |  127 -
 public/javascripts/calendar/lang/calendar-nl.js    |  127 -
 public/javascripts/calendar/lang/calendar-no.js    |   86 -
 public/javascripts/calendar/lang/calendar-pl.js    |  127 -
 public/javascripts/calendar/lang/calendar-pt-br.js |  129 -
 public/javascripts/calendar/lang/calendar-pt.js    |  128 -
 public/javascripts/calendar/lang/calendar-ro.js    |  127 -
 public/javascripts/calendar/lang/calendar-ru.js    |  127 -
 public/javascripts/calendar/lang/calendar-sk.js    |   68 -
 public/javascripts/calendar/lang/calendar-sl.js    |  127 -
 public/javascripts/calendar/lang/calendar-sq.js    |  126 -
 public/javascripts/calendar/lang/calendar-sr-yu.js |  127 -
 public/javascripts/calendar/lang/calendar-sr.js    |  127 -
 public/javascripts/calendar/lang/calendar-sv.js    |   84 -
 public/javascripts/calendar/lang/calendar-th.js    |  127 -
 public/javascripts/calendar/lang/calendar-tr.js    |  127 -
 public/javascripts/calendar/lang/calendar-uk.js    |  127 -
 public/javascripts/calendar/lang/calendar-vi.js    |  126 -
 public/javascripts/calendar/lang/calendar-zh-tw.js |  127 -
 public/javascripts/calendar/lang/calendar-zh.js    |  127 -
 public/javascripts/context_menu.js                 |  388 +-
 public/javascripts/controls.js                     |  963 ----
 public/javascripts/datepicker.js                   |   16 +
 public/javascripts/dragdrop.js                     |  973 ----
 public/javascripts/effects.js                      | 1128 ----
 public/javascripts/gantt.js                        |  172 +
 public/javascripts/i18n/jquery.ui.datepicker-ar.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-az.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-bg.js |   24 +
 public/javascripts/i18n/jquery.ui.datepicker-bs.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-ca.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-cs.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-da.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-de.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-el.js |   23 +
 .../javascripts/i18n/jquery.ui.datepicker-en-GB.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-es.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-et.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-eu.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-fa.js |   59 +
 public/javascripts/i18n/jquery.ui.datepicker-fi.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-fr.js |   25 +
 public/javascripts/i18n/jquery.ui.datepicker-gl.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-he.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-hr.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-hu.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-id.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-it.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-ja.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-ko.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-lt.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-lv.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-mk.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-nl.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-no.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-pl.js |   23 +
 .../javascripts/i18n/jquery.ui.datepicker-pt-BR.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-pt.js |   22 +
 public/javascripts/i18n/jquery.ui.datepicker-ro.js |   26 +
 public/javascripts/i18n/jquery.ui.datepicker-ru.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-sk.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-sl.js |   24 +
 public/javascripts/i18n/jquery.ui.datepicker-sq.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-sr.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-sv.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-th.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-tr.js |   23 +
 public/javascripts/i18n/jquery.ui.datepicker-uk.js |   24 +
 public/javascripts/i18n/jquery.ui.datepicker-vi.js |   23 +
 .../javascripts/i18n/jquery.ui.datepicker-zh-CN.js |   23 +
 .../javascripts/i18n/jquery.ui.datepicker-zh-TW.js |   23 +
 .../javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js |   11 +
 .../javascripts/jstoolbar/jstoolbar-textile.min.js |    2 +
 public/javascripts/jstoolbar/jstoolbar.js          |   10 +-
 public/javascripts/jstoolbar/lang/jstoolbar-az.js  |   16 +
 public/javascripts/jstoolbar/lang/jstoolbar-bg.js  |    2 +-
 public/javascripts/jstoolbar/lang/jstoolbar-et.js  |   22 +-
 public/javascripts/jstoolbar/lang/jstoolbar-lt.js  |    4 +-
 public/javascripts/jstoolbar/lang/jstoolbar-sk.js  |   16 +-
 public/javascripts/jstoolbar/textile.js            |   11 +
 public/javascripts/project_identifier.js           |   78 +
 public/javascripts/prototype.js                    | 6082 --------------------
 public/javascripts/raphael.js                      |   17 +-
 public/javascripts/repository_navigation.js        |   28 +-
 public/javascripts/revision_graph.js               |   45 +-
 public/javascripts/select_list_move.js             |   42 +-
 public/stylesheets/application.css                 |  712 ++-
 public/stylesheets/calendar.css                    |  237 -
 public/stylesheets/context_menu.css                |   41 +-
 public/stylesheets/csshover.htc                    |  122 -
 .../ui-bg_diagonals-thick_18_b81900_40x40.png      |  Bin 0 -> 260 bytes
 .../ui-bg_diagonals-thick_20_666666_40x40.png      |  Bin 0 -> 251 bytes
 .../jquery/images/ui-bg_flat_10_000000_40x100.png  |  Bin 0 -> 178 bytes
 .../jquery/images/ui-bg_glass_100_eef5fd_1x400.png |  Bin 0 -> 113 bytes
 .../jquery/images/ui-bg_glass_100_f6f6f6_1x400.png |  Bin 0 -> 104 bytes
 .../jquery/images/ui-bg_glass_65_ffffff_1x400.png  |  Bin 0 -> 105 bytes
 .../images/ui-bg_gloss-wave_35_759fcf_500x100.png  |  Bin 0 -> 3945 bytes
 .../ui-bg_highlight-soft_100_eeeeee_1x100.png      |  Bin 0 -> 90 bytes
 .../ui-bg_highlight-soft_75_759fcf_1x100.png       |  Bin 0 -> 126 bytes
 .../jquery/images/ui-icons_222222_256x240.png      |  Bin 0 -> 4369 bytes
 .../jquery/images/ui-icons_759fcf_256x240.png      |  Bin 0 -> 4369 bytes
 .../jquery/images/ui-icons_ffd27a_256x240.png      |  Bin 0 -> 4369 bytes
 .../jquery/images/ui-icons_ffffff_256x240.png      |  Bin 0 -> 4369 bytes
 public/stylesheets/jquery/jquery-ui-1.9.2.css      |    5 +
 public/stylesheets/jstoolbar.css                   |    3 +
 public/stylesheets/scm.css                         |  119 +-
 .../themes/alternate/stylesheets/application.css   |   48 +-
 script/about                                       |    8 +-
 script/breakpointer                                |    3 -
 script/console                                     |    3 -
 script/dbconsole                                   |    3 -
 script/destroy                                     |    3 -
 script/generate                                    |    3 -
 script/performance/benchmarker                     |    3 -
 script/performance/profiler                        |    3 -
 script/performance/request                         |    3 -
 script/plugin                                      |    3 -
 script/process/inspector                           |    3 -
 script/process/reaper                              |    3 -
 script/process/spawner                             |    3 -
 script/process/spinner                             |    3 -
 script/rails                                       |    6 +
 script/runner                                      |    3 -
 script/server                                      |    3 -
 test/exemplars/attachment_exemplar.rb              |   17 -
 test/exemplars/auth_source_exemplar.rb             |    4 -
 test/exemplars/board_exemplar.rb                   |    9 -
 test/exemplars/change_exemplar.rb                  |    9 -
 test/exemplars/changeset_exemplar.rb               |    9 -
 test/exemplars/comment_exemplar.rb                 |   13 -
 test/exemplars/custom_field_exemplar.rb            |    5 -
 test/exemplars/custom_value_exemplar.rb            |    7 -
 test/exemplars/document_category_exemplar.rb       |    5 -
 test/exemplars/document_exemplar.rb                |    4 -
 test/exemplars/enabled_module_exemplar.rb          |    4 -
 test/exemplars/enumeration_exemplar.rb             |    5 -
 test/exemplars/group_exemplar.rb                   |    4 -
 test/exemplars/issue_category_exemplar.rb          |    4 -
 test/exemplars/issue_exemplar.rb                   |   13 -
 test/exemplars/issue_priority_exemplar.rb          |    5 -
 test/exemplars/issue_status_exemplar.rb            |    4 -
 test/exemplars/journal_exemplar.rb                 |   13 -
 test/exemplars/member_exemplar.rb                  |   12 -
 test/exemplars/member_role_exemplar.rb             |   12 -
 test/exemplars/message_exemplar.rb                 |    9 -
 test/exemplars/news_exemplar.rb                    |    5 -
 test/exemplars/project_exemplar.rb                 |   18 -
 test/exemplars/query_exemplar.rb                   |    4 -
 test/exemplars/repository_exemplar.rb              |    5 -
 test/exemplars/role_exemplar.rb                    |    4 -
 test/exemplars/subversion_repository_exemplar.rb   |    5 -
 test/exemplars/time_entry_activity.rb              |    5 -
 test/exemplars/time_entry_exemplar.rb              |    9 -
 test/exemplars/tracker_exemplar.rb                 |    4 -
 test/exemplars/user_exemplar.rb                    |   12 -
 test/exemplars/version_exemplar.rb                 |    5 -
 test/exemplars/watcher_exemplar.rb                 |    7 -
 test/exemplars/wiki_content_exemplar.rb            |    8 -
 test/exemplars/wiki_exemplar.rb                    |    8 -
 test/exemplars/wiki_page_exemplar.rb               |    8 -
 test/exemplars/wiki_redirect_exemplar.rb           |    9 -
 test/extra/redmine_pm/repository_git_test.rb       |   97 +
 .../extra/redmine_pm/repository_subversion_test.rb |  294 +
 test/extra/redmine_pm/test_case.rb                 |   81 +
 test/fixtures/attachments.yml                      |   33 +
 test/fixtures/changes.yml                          |    1 -
 test/fixtures/changesets.yml                       |    4 +-
 test/fixtures/comments.yml                         |    1 -
 test/fixtures/custom_fields.yml                    |   19 +
 test/fixtures/custom_fields_trackers.yml           |    9 +
 test/fixtures/diffs/issue-12641-ja.diff            |   25 +
 test/fixtures/diffs/issue-12641-ru.diff            |   19 +
 test/fixtures/diffs/issue-13644-1.diff             |    7 +
 test/fixtures/diffs/issue-13644-2.diff             |    7 +
 test/fixtures/diffs/issue-13644-3.diff             |    7 +
 test/fixtures/diffs/issue-13644-4.diff             |    7 +
 test/fixtures/diffs/issue-13644-5.diff             |    7 +
 test/fixtures/documents.yml                        |    2 +-
 test/fixtures/enumerations.yml                     |    9 +
 .../files/{ => 2006/07}/060719210727_archive.zip   |  Bin
 .../07}/060719210727_changeset_iso8859-1.diff      |    0
 .../{ => 2006/07}/060719210727_changeset_utf8.diff |    0
 .../files/{ => 2006/07}/060719210727_source.rb     |    0
 .../{ => 2010/11}/101123161450_testfile_1.png      |  Bin
 .../{ => 2010/12}/101223161450_testfile_2.png      |  Bin
 test/fixtures/files/hg-export.diff                 |   13 +
 test/fixtures/groups_users.yml                     |    1 -
 test/fixtures/issue_categories.yml                 |    1 -
 test/fixtures/issue_relations.yml                  |    1 -
 test/fixtures/issues.yml                           |   51 +-
 test/fixtures/journal_details.yml                  |    4 +-
 .../gmail_with_attachment_iso-8859-1.eml           |   26 +
 .../mail_handler/gmail_with_attachment_ja.eml      |   20 +
 test/fixtures/mail_handler/multiple_text_parts.eml |   55 +
 test/fixtures/mail_handler/no_subject_header.eml   |   10 +
 .../mail_handler/subject_as_iso-8859-1.eml         |   11 +
 test/fixtures/mail_handler/subject_japanese_1.eml  |    7 +
 test/fixtures/mail_handler/subject_japanese_2.eml  |    7 +
 .../thunderbird_with_attachment_iso-8859-1.eml     |   34 +
 .../thunderbird_with_attachment_ja.eml             |   26 +
 .../mail_handler/ticket_with_custom_fields.eml     |    1 +
 test/fixtures/projects.yml                         |    1 -
 test/fixtures/projects_trackers.yml                |    4 +-
 test/fixtures/queries.yml                          |   27 +-
 test/fixtures/repositories.yml                     |    6 +-
 .../fixtures/repositories/bazaar_repository.tar.gz |  Bin 21287 -> 30817 bytes
 test/fixtures/roles.yml                            |   16 +-
 test/fixtures/user_preferences.yml                 |    2 +-
 test/fixtures/users.yml                            |   13 +-
 test/fixtures/watchers.yml                         |    1 -
 test/fixtures/wiki_content_versions.yml            |   14 +
 test/fixtures/wiki_contents.yml                    |    9 +-
 test/fixtures/wiki_pages.yml                       |    7 +
 test/fixtures/wikis.yml                            |    1 -
 test/fixtures/workflows.yml                        |  807 ++-
 test/functional/account_controller_openid_test.rb  |  165 +
 test/functional/account_controller_test.rb         |  331 +-
 test/functional/activities_controller_test.rb      |  125 +-
 test/functional/admin_controller_test.rb           |   29 +-
 test/functional/attachments_controller_test.rb     |   95 +-
 test/functional/auth_sources_controller_test.rb    |   55 +-
 test/functional/auto_completes_controller_test.rb  |   59 +-
 test/functional/boards_controller_test.rb          |   75 +-
 test/functional/calendars_controller_test.rb       |   86 +-
 test/functional/comments_controller_test.rb        |    2 +-
 test/functional/context_menus_controller_test.rb   |  237 +-
 test/functional/custom_fields_controller_test.rb   |  113 +-
 test/functional/documents_controller_test.rb       |   29 +-
 test/functional/enumerations_controller_test.rb    |   24 +-
 test/functional/files_controller_test.rb           |   37 +-
 test/functional/gantts_controller_test.rb          |  163 +-
 test/functional/groups_controller_test.rb          |   66 +-
 .../functional/issue_categories_controller_test.rb |   35 +-
 test/functional/issue_relations_controller_test.rb |   64 +-
 test/functional/issue_statuses_controller_test.rb  |   33 +-
 test/functional/issues_controller_test.rb          | 1781 ++++--
 .../issues_controller_transaction_test.rb          |   71 +-
 .../issues_custom_fields_visibility_test.rb        |  322 ++
 test/functional/journals_controller_test.rb        |   95 +-
 test/functional/mail_handler_controller_test.rb    |   12 +-
 test/functional/members_controller_test.rb         |   43 +-
 test/functional/messages_controller_test.rb        |   32 +-
 test/functional/my_controller_test.rb              |   76 +-
 test/functional/news_controller_test.rb            |   20 +-
 test/functional/previews_controller_test.rb        |   25 +-
 .../project_enumerations_controller_test.rb        |   26 +-
 test/functional/projects_controller_test.rb        |  609 +-
 test/functional/queries_controller_test.rb         |   98 +-
 test/functional/reports_controller_test.rb         |   33 +-
 .../repositories_bazaar_controller_test.rb         |   94 +-
 test/functional/repositories_controller_test.rb    |   72 +-
 .../functional/repositories_cvs_controller_test.rb |   39 +-
 .../repositories_darcs_controller_test.rb          |    2 +-
 .../repositories_filesystem_controller_test.rb     |    8 +-
 .../functional/repositories_git_controller_test.rb |  208 +-
 .../repositories_mercurial_controller_test.rb      |   96 +-
 .../repositories_subversion_controller_test.rb     |   90 +-
 test/functional/roles_controller_test.rb           |   44 +-
 test/functional/search_controller_test.rb          |   79 +-
 .../search_custom_fields_visibility_test.rb        |   78 +
 test/functional/sessions_test.rb                   |    6 +-
 test/functional/settings_controller_test.rb        |  116 +-
 test/functional/sys_controller_test.rb             |   14 +-
 .../time_entry_reports_controller_test.rb          |  123 +-
 test/functional/timelog_controller_test.rb         |  452 +-
 .../timelog_custom_fields_visibility_test.rb       |  113 +
 test/functional/trackers_controller_test.rb        |   88 +-
 test/functional/users_controller_test.rb           |  169 +-
 test/functional/versions_controller_test.rb        |   91 +-
 test/functional/watchers_controller_test.rb        |  109 +-
 test/functional/welcome_controller_test.rb         |  118 +-
 test/functional/wiki_controller_test.rb            |  189 +-
 test/functional/wikis_controller_test.rb           |   47 +-
 test/functional/workflows_controller_test.rb       |  211 +-
 test/integration/account_test.rb                   |  154 +-
 test/integration/admin_test.rb                     |    5 +-
 test/integration/api_test/api_test.rb              |   41 +
 test/integration/api_test/attachments_test.rb      |  176 +-
 test/integration/api_test/authentication_test.rb   |   73 +
 test/integration/api_test/custom_fields_test.rb    |   43 +
 .../integration/api_test/disabled_rest_api_test.rb |   30 +-
 test/integration/api_test/enumerations_test.rb     |   38 +
 test/integration/api_test/groups_test.rb           |  170 +
 test/integration/api_test/http_basic_login_test.rb |   22 +-
 .../http_basic_login_with_api_token_test.rb        |   22 +-
 test/integration/api_test/issue_categories_test.rb |  133 +-
 test/integration/api_test/issue_relations_test.rb  |  108 +-
 test/integration/api_test/issue_statuses_test.rb   |   41 +-
 test/integration/api_test/issues_test.rb           |  212 +-
 test/integration/api_test/jsonp_test.rb            |   72 +
 test/integration/api_test/memberships_test.rb      |  280 +-
 test/integration/api_test/news_test.rb             |  100 +-
 test/integration/api_test/projects_test.rb         |  424 +-
 test/integration/api_test/queries_test.rb          |   42 +-
 test/integration/api_test/roles_test.rb            |   79 +-
 test/integration/api_test/time_entries_test.rb     |  199 +-
 .../api_test/token_authentication_test.rb          |   33 +-
 test/integration/api_test/trackers_test.rb         |   41 +-
 test/integration/api_test/users_test.rb            |  566 +-
 test/integration/api_test/versions_test.rb         |  186 +-
 test/integration/api_test/wiki_pages_test.rb       |  194 +
 test/integration/application_test.rb               |   22 +-
 test/integration/attachments_test.rb               |  132 +
 test/integration/issues_test.rb                    |   16 +-
 test/integration/layout_test.rb                    |   63 +-
 test/integration/lib/redmine/hook_test.rb          |   89 +
 test/integration/lib/redmine/menu_manager_test.rb  |    5 +-
 test/integration/lib/redmine/themes_test.rb        |    2 +-
 test/integration/projects_test.rb                  |    4 +-
 test/integration/repositories_git_test.rb          |   50 +
 test/integration/routing/account_test.rb           |   12 +-
 test/integration/routing/activities_test.rb        |    6 +-
 test/integration/routing/admin_test.rb             |    2 +-
 test/integration/routing/attachments_test.rb       |   10 +-
 test/integration/routing/auth_sources_test.rb      |    6 +-
 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     |    9 +-
 test/integration/routing/documents_test.rb         |    2 +-
 test/integration/routing/enumerations_test.rb      |    6 +-
 test/integration/routing/files_test.rb             |    2 +-
 test/integration/routing/gantts_test.rb            |    2 +-
 test/integration/routing/groups_test.rb            |   42 +-
 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            |    6 +-
 test/integration/routing/journals_test.rb          |    2 +-
 test/integration/routing/mail_handler_test.rb      |    2 +-
 test/integration/routing/members_test.rb           |    6 +-
 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          |    4 +-
 .../routing/project_enumerations_test.rb           |    2 +-
 test/integration/routing/projects_test.rb          |   10 +-
 test/integration/routing/queries_test.rb           |    2 +-
 test/integration/routing/reports_test.rb           |    2 +-
 test/integration/routing/repositories_test.rb      |  136 +-
 test/integration/routing/roles_test.rb             |    6 +-
 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          |   10 +-
 test/integration/routing/users_test.rb             |    2 +-
 test/integration/routing/versions_test.rb          |    2 +-
 test/integration/routing/watchers_test.rb          |   16 +-
 test/integration/routing/welcome_test.rb           |    2 +-
 test/integration/routing/wiki_test.rb              |   84 +-
 test/integration/routing/wikis_test.rb             |    2 +-
 test/integration/routing/workflows_test.rb         |    8 +-
 test/integration/users_test.rb                     |    4 +-
 test/mocks/open_id_authentication_mock.rb          |    3 +-
 test/object_daddy_helpers.rb                       |   40 -
 test/object_helpers.rb                             |  181 +
 test/test_helper.rb                                |  627 +-
 test/ui/base.rb                                    |   72 +
 test/ui/issues_test.rb                             |  264 +
 test/unit/activity_test.rb                         |   38 +-
 test/unit/attachment_test.rb                       |  141 +-
 test/unit/auth_source_ldap_test.rb                 |  115 +-
 test/unit/board_test.rb                            |   83 +-
 test/unit/changeset_test.rb                        |   85 +-
 test/unit/comment_test.rb                          |   11 +-
 test/unit/custom_field_test.rb                     |  104 +-
 test/unit/custom_field_user_format_test.rb         |    2 +-
 test/unit/custom_field_version_format_test.rb      |    2 +-
 test/unit/custom_value_test.rb                     |    2 +-
 test/unit/default_data_test.rb                     |    2 +-
 test/unit/document_category_test.rb                |   14 +-
 test/unit/document_test.rb                         |   16 +-
 test/unit/enabled_module_test.rb                   |    2 +-
 test/unit/enumeration_test.rb                      |   18 +-
 test/unit/group_test.rb                            |   45 +-
 test/unit/helpers/activities_helper_test.rb        |  102 +
 test/unit/helpers/application_helper_test.rb       |  372 +-
 test/unit/helpers/custom_fields_helper_test.rb     |    6 +-
 test/unit/helpers/issues_helper_test.rb            |  284 +-
 test/unit/helpers/projects_helper_test.rb          |    8 +-
 test/unit/helpers/queries_helper_test.rb           |   39 +
 test/unit/helpers/search_helper_test.rb            |    3 +-
 test/unit/helpers/sort_helper_test.rb              |   15 +-
 test/unit/helpers/timelog_helper_test.rb           |    3 +-
 test/unit/helpers/watchers_helper_test.rb          |   69 +
 test/unit/initializers/patches_test.rb             |   26 +-
 test/unit/issue_category_test.rb                   |    4 +-
 test/unit/issue_custom_field_test.rb               |   42 +
 test/unit/issue_nested_set_test.rb                 |  257 +-
 test/unit/issue_priority_test.rb                   |   72 +-
 test/unit/issue_relation_test.rb                   |  129 +-
 test/unit/issue_status_test.rb                     |   30 +-
 test/unit/issue_test.rb                            | 1589 ++++-
 test/unit/issue_transaction_test.rb                |   54 +
 test/unit/journal_observer_test.rb                 |   87 +-
 test/unit/journal_test.rb                          |  143 +-
 test/unit/lib/redmine/access_control_test.rb       |   12 +-
 test/unit/lib/redmine/ciphering_test.rb            |   22 +-
 test/unit/lib/redmine/codeset_util_test.rb         |    2 +-
 test/unit/lib/redmine/configuration_test.rb        |    2 +-
 test/unit/lib/redmine/export/pdf_test.rb           |    9 +-
 test/unit/lib/redmine/helpers/calendar_test.rb     |    2 +-
 test/unit/lib/redmine/helpers/diff_test.rb         |   25 +
 test/unit/lib/redmine/helpers/gantt_test.rb        |  248 +-
 test/unit/lib/redmine/hook_test.rb                 |   16 +-
 test/unit/lib/redmine/i18n_test.rb                 |  111 +-
 test/unit/lib/redmine/info_test.rb                 |   27 +
 test/unit/lib/redmine/menu_manager/mapper_test.rb  |   15 +-
 .../lib/redmine/menu_manager/menu_helper_test.rb   |    4 +-
 test/unit/lib/redmine/menu_manager_test.rb         |   16 +-
 test/unit/lib/redmine/mime_type_test.rb            |    2 +-
 test/unit/lib/redmine/notifiable_test.rb           |    2 +-
 test/unit/lib/redmine/pagination_helper_test.rb    |   34 +
 test/unit/lib/redmine/pagination_test.rb           |   94 +
 test/unit/lib/redmine/plugin_test.rb               |   81 +-
 test/unit/lib/redmine/safe_attributes_test.rb      |    3 +-
 .../redmine/scm/adapters/bazaar_adapter_test.rb    |   73 +-
 .../lib/redmine/scm/adapters/cvs_adapter_test.rb   |   35 +-
 .../lib/redmine/scm/adapters/darcs_adapter_test.rb |   19 +-
 .../scm/adapters/filesystem_adapter_test.rb        |   16 +
 .../lib/redmine/scm/adapters/git_adapter_test.rb   |  118 +-
 .../redmine/scm/adapters/mercurial_adapter_test.rb |   30 +-
 .../scm/adapters/subversion_adapter_test.rb        |    4 +-
 test/unit/lib/redmine/themes_test.rb               |    2 +-
 test/unit/lib/redmine/unified_diff_test.rb         |  195 +-
 test/unit/lib/redmine/utils/date_calculation.rb    |   76 +
 test/unit/lib/redmine/views/builders/json_test.rb  |    4 +-
 test/unit/lib/redmine/views/builders/xml_test.rb   |    4 +-
 .../lib/redmine/wiki_formatting/macros_test.rb     |  269 +-
 .../wiki_formatting/textile_formatter_test.rb      |   60 +-
 test/unit/lib/redmine/wiki_formatting_test.rb      |    7 +-
 test/unit/lib/redmine_test.rb                      |    2 +-
 test/unit/mail_handler_test.rb                     |  377 +-
 test/unit/mailer_test.rb                           |  396 +-
 test/unit/member_test.rb                           |   69 +-
 test/unit/message_test.rb                          |   60 +-
 test/unit/news_test.rb                             |    9 +-
 test/unit/principal_test.rb                        |  103 +-
 test/unit/project_copy_test.rb                     |  337 ++
 test/unit/project_members_inheritance_test.rb      |  263 +
 test/unit/project_nested_set_test.rb               |  229 +-
 test/unit/project_test.rb                          |  729 +--
 test/unit/query_test.rb                            |  819 ++-
 test/unit/repository_bazaar_test.rb                |  173 +-
 test/unit/repository_cvs_test.rb                   |    9 +-
 test/unit/repository_darcs_test.rb                 |   11 +-
 test/unit/repository_filesystem_test.rb            |   13 +-
 test/unit/repository_git_test.rb                   |   47 +-
 test/unit/repository_mercurial_test.rb             |   17 +-
 test/unit/repository_subversion_test.rb            |   48 +-
 test/unit/repository_test.rb                       |   68 +-
 test/unit/role_test.rb                             |  100 +-
 test/unit/search_test.rb                           |    6 +-
 test/unit/setting_test.rb                          |   40 +-
 test/unit/testing_test.rb                          |   46 -
 test/unit/time_entry_activity_test.rb              |   34 +-
 test/unit/time_entry_test.rb                       |   12 +-
 test/unit/token_test.rb                            |   49 +-
 test/unit/tracker_test.rb                          |   85 +-
 test/unit/user_preference_test.rb                  |   22 +-
 test/unit/user_test.rb                             |  433 +-
 test/unit/version_test.rb                          |  218 +-
 test/unit/watcher_test.rb                          |   29 +-
 test/unit/wiki_content_test.rb                     |   84 +-
 test/unit/wiki_content_version_test.rb             |   68 +
 test/unit/wiki_page_test.rb                        |   31 +-
 test/unit/wiki_redirect_test.rb                    |    4 +-
 test/unit/wiki_test.rb                             |   28 +-
 test/unit/workflow_test.rb                         |   48 +-
 .../should_not_be_copied.txt => tmp/pdf/empty      |    0
 .../test_assets/init.rb => tmp/thumbnails/empty    |    0
 .../lib/acts_as_activity_provider.rb               |   88 -
 .../acts_as_attachable/lib/acts_as_attachable.rb   |  102 -
 .../lib/acts_as_customizable.rb                    |  161 -
 vendor/plugins/acts_as_event/lib/acts_as_event.rb  |   91 -
 .../acts_as_list/lib/active_record/acts/list.rb    |  270 -
 .../acts_as_searchable/lib/acts_as_searchable.rb   |  133 -
 .../acts_as_tree/lib/active_record/acts/tree.rb    |  110 -
 .../acts_as_versioned/lib/acts_as_versioned.rb     |  564 --
 .../acts_as_watchable/lib/acts_as_watchable.rb     |   85 -
 vendor/plugins/awesome_nested_set/MIT-LICENSE      |   20 -
 vendor/plugins/awesome_nested_set/README.rdoc      |   64 -
 vendor/plugins/awesome_nested_set/Rakefile         |   46 -
 .../awesome_nested_set/awesome_nested_set.gemspec  |   20 -
 vendor/plugins/awesome_nested_set/init.rb          |    1 -
 .../awesome_nested_set/lib/awesome_nested_set.rb   |  554 --
 .../lib/awesome_nested_set/compatability.rb        |   29 -
 .../lib/awesome_nested_set/helper.rb               |   40 -
 .../lib/awesome_nested_set/named_scope.rb          |  140 -
 .../test/awesome_nested_set_test.rb                |  603 --
 vendor/plugins/classic_pagination/CHANGELOG        |  152 -
 vendor/plugins/classic_pagination/README           |   18 -
 vendor/plugins/classic_pagination/Rakefile         |   22 -
 vendor/plugins/classic_pagination/init.rb          |   33 -
 vendor/plugins/classic_pagination/install.rb       |    1 -
 .../plugins/classic_pagination/lib/pagination.rb   |  405 --
 .../classic_pagination/lib/pagination_helper.rb    |  135 -
 .../classic_pagination/test/fixtures/companies.yml |   24 -
 .../classic_pagination/test/fixtures/company.rb    |    9 -
 .../classic_pagination/test/fixtures/developer.rb  |    7 -
 .../test/fixtures/developers.yml                   |   21 -
 .../test/fixtures/developers_projects.yml          |   13 -
 .../classic_pagination/test/fixtures/project.rb    |    3 -
 .../classic_pagination/test/fixtures/projects.yml  |    7 -
 .../classic_pagination/test/fixtures/replies.yml   |   13 -
 .../classic_pagination/test/fixtures/reply.rb      |    5 -
 .../classic_pagination/test/fixtures/schema.sql    |   42 -
 .../classic_pagination/test/fixtures/topic.rb      |    3 -
 .../classic_pagination/test/fixtures/topics.yml    |   22 -
 vendor/plugins/classic_pagination/test/helper.rb   |  117 -
 .../test/pagination_helper_test.rb                 |   38 -
 .../classic_pagination/test/pagination_test.rb     |  177 -
 vendor/plugins/engines/.gitignore                  |    3 -
 vendor/plugins/engines/CHANGELOG                   |  274 -
 vendor/plugins/engines/MIT-LICENSE                 |   21 -
 vendor/plugins/engines/README                      |   83 -
 vendor/plugins/engines/Rakefile                    |  226 -
 vendor/plugins/engines/about.yml                   |    7 -
 vendor/plugins/engines/boot.rb                     |   17 -
 .../engines/generators/plugin_migration/USAGE      |   45 -
 .../plugin_migration/plugin_migration_generator.rb |   98 -
 .../templates/plugin_migration.erb                 |   13 -
 vendor/plugins/engines/init.rb                     |    5 -
 vendor/plugins/engines/lib/engines.rb              |  174 -
 vendor/plugins/engines/lib/engines/assets.rb       |   36 -
 vendor/plugins/engines/lib/engines/plugin.rb       |   97 -
 vendor/plugins/engines/lib/engines/plugin/list.rb  |   30 -
 .../plugins/engines/lib/engines/plugin/loader.rb   |   11 -
 .../plugins/engines/lib/engines/plugin/locator.rb  |   11 -
 .../plugins/engines/lib/engines/plugin/migrator.rb |   41 -
 .../lib/engines/rails_extensions/asset_helpers.rb  |  119 -
 .../lib/engines/rails_extensions/dependencies.rb   |  138 -
 .../engines/rails_extensions/form_tag_helpers.rb   |   37 -
 .../lib/engines/rails_extensions/migrations.rb     |  133 -
 .../engines/lib/engines/rails_extensions/rails.rb  |   11 -
 vendor/plugins/engines/lib/engines/testing.rb      |  101 -
 vendor/plugins/engines/lib/tasks/engines.rake      |  281 -
 .../app/controllers/app_and_plugin_controller.rb   |    5 -
 .../namespace/app_and_plugin_controller.rb         |    5 -
 .../engines/test/app/helpers/mail_helper.rb        |    5 -
 .../test/app/models/app_and_plugin_model.rb        |    3 -
 .../plugins/engines/test/app/models/notify_mail.rb |   26 -
 vendor/plugins/engines/test/app/things/thing.rb    |    3 -
 .../test/app/views/app_and_plugin/a_view.html.erb  |    1 -
 .../views/namespace/app_and_plugin/a_view.html.erb |    1 -
 .../notify_mail/implicit_multipart.text.html.erb   |    1 -
 .../notify_mail/implicit_multipart.text.plain.erb  |    1 -
 .../app/views/notify_mail/multipart_html.html.erb  |    1 -
 .../app/views/notify_mail/multipart_plain.html.erb |    1 -
 .../app/views/notify_mail/signup.text.plain.erb    |    5 -
 ...plugin_with_application_template.text.plain.erb |    1 -
 ...plugin_with_application_template_plain.html.erb |    1 -
 .../test/functional/controller_loading_test.rb     |   51 -
 .../exception_notification_compatibility_test.rb   |   29 -
 .../engines/test/functional/locale_loading_test.rb |   26 -
 .../plugins/engines/test/functional/routes_test.rb |   29 -
 .../engines/test/functional/view_helpers_test.rb   |   37 -
 .../engines/test/functional/view_loading_test.rb   |   60 -
 .../engines/test/lib/app_and_plugin_lib_model.rb   |    3 -
 .../engines/test/lib/engines_test_helper.rb        |   42 -
 .../plugins/engines/test/lib/render_information.rb |    7 -
 .../app/controllers/alpha_plugin_controller.rb     |    8 -
 .../app/controllers/app_and_plugin_controller.rb   |    5 -
 .../namespace/alpha_plugin_controller.rb           |    5 -
 .../namespace/app_and_plugin_controller.rb         |    5 -
 .../namespace/shared_plugin_controller.rb          |    5 -
 .../app/controllers/shared_plugin_controller.rb    |    5 -
 .../alpha_plugin/app/models/alpha_plugin_model.rb  |    3 -
 .../app/models/app_and_plugin_model.rb             |    7 -
 .../alpha_plugin/app/models/shared_plugin_model.rb |    3 -
 .../app/views/alpha_plugin/a_view.html.erb         |    1 -
 .../app/views/app_and_plugin/a_view.html.erb       |    1 -
 .../app/views/layouts/plugin_layout.erb            |    1 -
 .../views/namespace/alpha_plugin/a_view.html.erb   |    1 -
 .../views/namespace/app_and_plugin/a_view.html.erb |    1 -
 .../views/namespace/shared_plugin/a_view.html.erb  |    1 -
 .../app/views/shared_plugin/a_view.html.erb        |    1 -
 .../alpha_plugin/lib/alpha_plugin_lib_model.rb     |    3 -
 .../alpha_plugin/lib/app_and_plugin_lib_model.rb   |    7 -
 .../test/plugins/alpha_plugin/locales/en.yml       |    3 -
 .../app/controllers/app_and_plugin_controller.rb   |    5 -
 .../namespace/shared_plugin_controller.rb          |    5 -
 .../app/controllers/shared_plugin_controller.rb    |    5 -
 .../beta_plugin/app/models/shared_plugin_model.rb  |    3 -
 .../views/namespace/shared_plugin/a_view.html.erb  |    1 -
 .../app/views/shared_plugin/a_view.html.erb        |    1 -
 .../engines/test/plugins/beta_plugin/init.rb       |    1 -
 .../test/plugins/beta_plugin/locales/en.yml        |    3 -
 .../app/controllers/assets_controller.rb           |    2 -
 .../test_assets/app/views/assets/index.html.erb    |    4 -
 .../test_assets/app/views/layouts/assets.html.erb  |    3 -
 .../test/plugins/test_assets/public/file.txt       |    0
 .../public/subfolder/file_in_subfolder.txt         |    0
 .../assets/file.txt                                |    0
 .../assets/subfolder/file_in_subfolder.txt         |    0
 .../test_assets_with_assets_directory/init.rb      |    0
 .../assets/file.txt                                |    0
 .../test_assets_with_no_subdirectory/init.rb       |    0
 .../plugins/test_code_mixing/app/things/thing.rb   |    3 -
 .../engines/test/plugins/test_code_mixing/init.rb  |    1 -
 .../engines/test/plugins/test_load_path/init.rb    |    0
 .../test_migration/db/migrate/001_create_tests.rb  |   11 -
 .../test_migration/db/migrate/002_create_others.rb |   11 -
 .../test_migration/db/migrate/003_create_extras.rb |   11 -
 .../engines/test/plugins/test_migration/init.rb    |    0
 .../test_plugin_mailing/app/models/plugin_mail.rb  |   26 -
 .../app/views/plugin_mail/mail_from_plugin.erb     |    1 -
 .../multipart_from_plugin_html.html.erb            |    1 -
 .../multipart_from_plugin_plain.html.erb           |    1 -
 ..._plugin_with_application_template_html.html.erb |    1 -
 ...plugin_with_application_template_plain.html.erb |    1 -
 .../test/plugins/test_plugin_mailing/init.rb       |    0
 .../namespace/test_routing_controller.rb           |    5 -
 .../app/controllers/test_routing_controller.rb     |    9 -
 .../test/plugins/test_routing/config/routes.rb     |    4 -
 .../engines/test/plugins/test_routing/init.rb      |    0
 .../test/plugins/test_testing/app/README.txt       |    1 -
 .../engines/test/plugins/test_testing/init.rb      |    0
 .../test/fixtures/testing_fixtures.yml             |    0
 .../test_testing/test/unit/override_test.rb        |   13 -
 .../engines/test/unit/action_mailer_test.rb        |   54 -
 .../test/unit/arbitrary_code_mixing_test.rb        |   41 -
 vendor/plugins/engines/test/unit/assets_test.rb    |   52 -
 .../engines/test/unit/backwards_compat_test.rb     |    8 -
 vendor/plugins/engines/test/unit/load_path_test.rb |   58 -
 vendor/plugins/engines/test/unit/migration_test.rb |   63 -
 .../engines/test/unit/model_and_lib_test.rb        |   37 -
 vendor/plugins/engines/test/unit/plugins_test.rb   |   11 -
 .../test/unit/test_testing/override_test.rb        |    7 -
 vendor/plugins/engines/test/unit/testing_test.rb   |   19 -
 vendor/plugins/open_id_authentication/CHANGELOG    |   35 -
 vendor/plugins/open_id_authentication/README       |  231 -
 vendor/plugins/open_id_authentication/init.rb      |   16 -
 .../lib/open_id_authentication.rb                  |  241 -
 .../lib/open_id_authentication/association.rb      |    9 -
 .../lib/open_id_authentication/nonce.rb            |    5 -
 .../open_id_authentication/test/test_helper.rb     |   17 -
 vendor/plugins/prepend_engine_views/init.rb        |   21 -
 vendor/plugins/rfpdf/README                        |   45 -
 vendor/plugins/rfpdf/init.rb                       |   11 -
 vendor/plugins/rfpdf/lib/core/rmagick.rb           |   69 -
 vendor/plugins/rfpdf/lib/fpdf/fpdf_eps.rb          |  139 -
 vendor/plugins/rfpdf/lib/tcpdf.rb                  | 4339 --------------
 1635 files changed, 73314 insertions(+), 53732 deletions(-)

diff --cc debian/changelog
index 4d01def,3f01541..0970f16
--- a/debian/changelog
+++ b/debian/changelog
@@@ -5,38 -184,11 +184,40 @@@ redmine (2.1.4+dfsg1-1) experimental; u
        it is needed when using fastcgi with ruby1.9.
      + Recommends: ruby-passenger.
      + Depends on ruby-{pg,mysql,sqlite3} instead of libxxx-ruby packages.
+   * debian/postinst: use exit 1 instead of illegal negative value.
+     (Closes: #687449)
  
-  -- Jérémy Lal <kapouer at melix.org>  Tue, 26 Jun 2012 00:39:43 +0200
+  -- Ondřej Surý <ondrej at debian.org>  Mon, 10 Dec 2012 12:33:19 +0100
  
 +redmine (1.4.4+dfsg1-3) unstable; urgency=low
 +
 +  [ Jérémy Lal ]
 +  * This release is a candidate for proposed-updates.
 +    Changes have been kept to the minimum.
 +
 +  [ Ondřej Surý ]
 +  * Pull upstream fixes for Ruby 1.9 as default interpreter:
 +    + Replace missing ParseDate with DateTime (Closes: #700754)
 +    + Fix broken REST API (Closes: #700009)
 +
 + -- Jérémy Lal <kapouer at melix.org>  Sat, 11 May 2013 16:26:27 +0200
 +
 +redmine (1.4.4+dfsg1-2) unstable; urgency=low
 +
 +  * Manage and set dbuser default value like dbname. (Closes: #695774)
 +
 + -- Jérémy Lal <kapouer at melix.org>  Sat, 19 Jan 2013 15:54:02 +0100
 +
 +redmine (1.4.4+dfsg1-1.1) unstable; urgency=medium
 +
 +  * Non-maintainer upload.
 +  * debian/control: add dependency on rubygems or recent enough ruby
 +    (Closes: #693994) [Axel Beckert].
 +  * debian/postinst: replace exit status -1 with 2 for shell compatibility
 +    (e.g. ksh) (Closes: #687449).
 +
 + -- Dominik George <nik at naturalnet.de>  Sun, 29 Nov 2012 14:18:29 +0200
 +
  redmine (1.4.4+dfsg1-1) unstable; urgency=low
  
    * Upstream update.
diff --cc debian/gbp.conf
index 844e55c,1abb041..ad1914a
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -4,9 -4,9 +4,8 @@@
  pristine-tar = True
  sign-tags = True
  
--# there are separate branches for stable and experimental
 -upstream-branch = upstream-experimental
 -debian-branch = master-experimental
 +upstream-branch = upstream
- debian-branch = master-stable
++debian-branch = master
  
  
  [git-import-orig]
diff --cc debian/patches/series
index ccd3bd7,16d6b74..f90e540
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,8 +1,10 @@@
  2002_FHS_through_env_vars.patch
  2003_externalize_session_config.patch
  2004_FHS_plugins_assets.patch
- 2005_FHS_schema_dump.patch
  2008_force_table_encoding_mysql.patch
  2009_FHS_thin_config.patch
+ 2018_get_rid_of_rdoctask.patch
+ 2019_unplug_bundler.patch
  2017_Gemfile_debian.patch
 +1001_Parsedate.parsedate.patch
 +1002_REST_API_ruby1.9.3.patch

-- 
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