]> source.dussan.org Git - redmine.git/commit
Merged rails-4.1 branch (#14534).
authorJean-Philippe Lang <jp_lang@yahoo.fr>
Wed, 22 Oct 2014 17:37:16 +0000 (17:37 +0000)
committerJean-Philippe Lang <jp_lang@yahoo.fr>
Wed, 22 Oct 2014 17:37:16 +0000 (17:37 +0000)
commit2d1866d966d94c688f9cb87c5bf3f096dffac844
tree7a733c1cc51448ab69b3f892285305dbfb0ae15e
parenta6ec78a4dc658e3517ed682792016b6530458696
Merged rails-4.1 branch (#14534).

git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
331 files changed:
.travis.run-test.sh [new file with mode: 0644]
.travis.yml
Gemfile
app/controllers/admin_controller.rb
app/controllers/application_controller.rb
app/controllers/auto_completes_controller.rb
app/controllers/boards_controller.rb
app/controllers/documents_controller.rb
app/controllers/enumerations_controller.rb
app/controllers/files_controller.rb
app/controllers/groups_controller.rb
app/controllers/issue_categories_controller.rb
app/controllers/issue_statuses_controller.rb
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/controllers/members_controller.rb
app/controllers/messages_controller.rb
app/controllers/my_controller.rb
app/controllers/news_controller.rb
app/controllers/project_enumerations_controller.rb
app/controllers/projects_controller.rb
app/controllers/queries_controller.rb
app/controllers/reports_controller.rb
app/controllers/repositories_controller.rb
app/controllers/roles_controller.rb
app/controllers/search_controller.rb
app/controllers/sys_controller.rb
app/controllers/timelog_controller.rb
app/controllers/trackers_controller.rb
app/controllers/users_controller.rb
app/controllers/versions_controller.rb
app/controllers/watchers_controller.rb
app/controllers/wiki_controller.rb
app/controllers/workflows_controller.rb
app/helpers/application_helper.rb
app/helpers/groups_helper.rb
app/helpers/issues_helper.rb
app/helpers/members_helper.rb
app/helpers/my_helper.rb
app/helpers/projects_helper.rb
app/helpers/queries_helper.rb
app/helpers/search_helper.rb
app/helpers/sort_helper.rb
app/helpers/timelog_helper.rb
app/models/attachment.rb
app/models/auth_source.rb
app/models/board.rb
app/models/change.rb
app/models/changeset.rb
app/models/comment.rb
app/models/custom_field.rb
app/models/custom_value.rb
app/models/document.rb
app/models/enabled_module.rb
app/models/enumeration.rb
app/models/group.rb
app/models/group_anonymous.rb
app/models/group_builtin.rb
app/models/group_non_member.rb
app/models/issue.rb
app/models/issue_category.rb
app/models/issue_custom_field.rb
app/models/issue_query.rb
app/models/issue_status.rb
app/models/journal.rb
app/models/journal_detail.rb
app/models/mail_handler.rb
app/models/member.rb
app/models/member_role.rb
app/models/message.rb
app/models/news.rb
app/models/principal.rb
app/models/project.rb
app/models/query.rb
app/models/repository.rb
app/models/repository/cvs.rb
app/models/repository/git.rb
app/models/repository/mercurial.rb
app/models/repository/subversion.rb
app/models/role.rb
app/models/setting.rb
app/models/time_entry.rb
app/models/time_entry_query.rb
app/models/token.rb
app/models/tracker.rb
app/models/user.rb
app/models/version.rb
app/models/watcher.rb
app/models/wiki.rb
app/models/wiki_content.rb
app/models/wiki_page.rb
app/models/wiki_redirect.rb
app/models/workflow_rule.rb
app/models/workflow_transition.rb
app/views/common/_tabs.html.erb
app/views/groups/_memberships.html.erb
app/views/projects/settings/_members.html.erb
app/views/timelog/_form.html.erb
app/views/users/_memberships.html.erb
app/views/wiki/edit.html.erb
app/views/wiki/rename.html.erb
bin/about [new file with mode: 0755]
bin/bundle [new file with mode: 0644]
bin/rails [new file with mode: 0644]
bin/rake [new file with mode: 0644]
config/application.rb
config/boot.rb
config/database.yml.example
config/environment.rb
config/environments/development.rb
config/environments/production.rb
config/environments/test.rb
config/environments/test_pgsql.rb
config/environments/test_sqlite3.rb
config/initializers/10-patches.rb
config/initializers/30-redmine.rb
config/locales/ja.yml
config/locales/zh-TW.yml
config/preinitializer.rb [deleted file]
config/routes.rb
db/migrate/001_setup.rb
db/migrate/072_add_enumerations_position.rb
db/migrate/078_add_custom_fields_position.rb
db/migrate/101_populate_changesets_user_id.rb
db/migrate/20091225164732_remove_enumerations_opt.rb
db/migrate/20100819172912_enable_calendar_and_gantt_modules_where_appropriate.rb
db/migrate/20130215111141_populate_issues_closed_on.rb
doc/CHANGELOG
doc/INSTALL
lib/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
lib/plugins/acts_as_attachable/lib/acts_as_attachable.rb
lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
lib/plugins/acts_as_searchable/lib/acts_as_searchable.rb
lib/plugins/acts_as_tree/lib/active_record/acts/tree.rb
lib/plugins/acts_as_watchable/lib/acts_as_watchable.rb
lib/plugins/awesome_nested_set/.autotest [deleted file]
lib/plugins/awesome_nested_set/.gitignore [deleted file]
lib/plugins/awesome_nested_set/.travis.yml [deleted file]
lib/plugins/awesome_nested_set/CHANGELOG [deleted file]
lib/plugins/awesome_nested_set/CONTRIBUTING.md [deleted file]
lib/plugins/awesome_nested_set/Gemfile [deleted file]
lib/plugins/awesome_nested_set/MIT-LICENSE [deleted file]
lib/plugins/awesome_nested_set/README.md [deleted file]
lib/plugins/awesome_nested_set/Rakefile [deleted file]
lib/plugins/awesome_nested_set/awesome_nested_set.gemspec [deleted file]
lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.0.rb [deleted file]
lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.1.rb [deleted file]
lib/plugins/awesome_nested_set/gemfiles/Gemfile.rails-3.2.rb [deleted file]
lib/plugins/awesome_nested_set/init.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/columns.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/helper.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/iterator.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/movable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/prunable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/rebuildable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/relatable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/transactable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/model/validatable.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/move.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/set_validator.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/tree.rb [deleted file]
lib/plugins/awesome_nested_set/lib/awesome_nested_set/version.rb [deleted file]
lib/plugins/awesome_nested_set/spec/awesome_nested_set/helper_spec.rb [deleted file]
lib/plugins/awesome_nested_set/spec/awesome_nested_set_spec.rb [deleted file]
lib/plugins/awesome_nested_set/spec/db/database.yml [deleted file]
lib/plugins/awesome_nested_set/spec/db/schema.rb [deleted file]
lib/plugins/awesome_nested_set/spec/fixtures/brokens.yml [deleted file]
lib/plugins/awesome_nested_set/spec/fixtures/categories.yml [deleted file]
lib/plugins/awesome_nested_set/spec/fixtures/departments.yml [deleted file]
lib/plugins/awesome_nested_set/spec/fixtures/notes.yml [deleted file]
lib/plugins/awesome_nested_set/spec/fixtures/things.yml [deleted file]
lib/plugins/awesome_nested_set/spec/spec_helper.rb [deleted file]
lib/plugins/awesome_nested_set/spec/support/models.rb [deleted file]
lib/redmine.rb
lib/redmine/access_control.rb
lib/redmine/codeset_util.rb
lib/redmine/core_ext/active_record.rb
lib/redmine/core_ext/string/conversions.rb
lib/redmine/export/pdf.rb
lib/redmine/field_format.rb
lib/redmine/helpers/gantt.rb
lib/redmine/menu_manager.rb
lib/redmine/scm/adapters/abstract_adapter.rb
lib/redmine/scm/adapters/bazaar_adapter.rb
lib/redmine/scm/adapters/cvs_adapter.rb
lib/redmine/scm/adapters/darcs_adapter.rb
lib/redmine/scm/adapters/git_adapter.rb
lib/redmine/scm/adapters/mercurial_adapter.rb
lib/redmine/scm/adapters/subversion_adapter.rb
lib/redmine/unified_diff.rb
lib/tasks/ci.rake
lib/tasks/locales.rake
lib/tasks/migrate_from_mantis.rake
lib/tasks/migrate_from_trac.rake
script/about
script/rails
test/functional/account_controller_test.rb
test/functional/activities_controller_test.rb
test/functional/attachments_controller_test.rb
test/functional/calendars_controller_test.rb
test/functional/context_menus_controller_test.rb
test/functional/custom_fields_controller_test.rb
test/functional/groups_controller_test.rb
test/functional/issues_controller_test.rb
test/functional/issues_custom_fields_visibility_test.rb
test/functional/members_controller_test.rb
test/functional/messages_controller_test.rb
test/functional/my_controller_test.rb
test/functional/repositories_bazaar_controller_test.rb
test/functional/repositories_filesystem_controller_test.rb
test/functional/repositories_git_controller_test.rb
test/functional/repositories_mercurial_controller_test.rb
test/functional/roles_controller_test.rb
test/functional/search_controller_test.rb
test/functional/time_entry_reports_controller_test.rb
test/functional/timelog_controller_test.rb
test/functional/timelog_custom_fields_visibility_test.rb
test/functional/welcome_controller_test.rb
test/functional/wiki_controller_test.rb
test/functional/workflows_controller_test.rb
test/integration/account_test.rb
test/integration/admin_test.rb
test/integration/api_test/authentication_test.rb
test/integration/api_test/memberships_test.rb
test/integration/api_test/projects_test.rb
test/integration/application_test.rb
test/integration/attachments_test.rb
test/integration/feeds_test.rb
test/integration/issues_test.rb
test/integration/layout_test.rb
test/integration/lib/redmine/hook_test.rb
test/integration/lib/redmine/menu_manager_test.rb
test/integration/lib/redmine/themes_test.rb
test/integration/projects_test.rb
test/integration/repositories_git_test.rb
test/integration/routing/account_test.rb
test/integration/routing/activities_test.rb
test/integration/routing/admin_test.rb
test/integration/routing/attachments_test.rb
test/integration/routing/auth_sources_test.rb
test/integration/routing/auto_completes_test.rb
test/integration/routing/boards_test.rb
test/integration/routing/calendars_test.rb
test/integration/routing/comments_test.rb
test/integration/routing/context_menus_test.rb
test/integration/routing/custom_fields_test.rb
test/integration/routing/documents_test.rb
test/integration/routing/enumerations_test.rb
test/integration/routing/files_test.rb
test/integration/routing/gantts_test.rb
test/integration/routing/groups_test.rb
test/integration/routing/issue_categories_test.rb
test/integration/routing/issue_relations_test.rb
test/integration/routing/issue_statuses_test.rb
test/integration/routing/issues_test.rb
test/integration/routing/journals_test.rb
test/integration/routing/mail_handler_test.rb
test/integration/routing/members_test.rb
test/integration/routing/messages_test.rb
test/integration/routing/my_test.rb
test/integration/routing/news_test.rb
test/integration/routing/previews_test.rb
test/integration/routing/project_enumerations_test.rb
test/integration/routing/projects_test.rb
test/integration/routing/queries_test.rb
test/integration/routing/reports_test.rb
test/integration/routing/repositories_test.rb
test/integration/routing/roles_test.rb
test/integration/routing/search_test.rb
test/integration/routing/settings_test.rb
test/integration/routing/sys_test.rb
test/integration/routing/timelog_test.rb
test/integration/routing/trackers_test.rb
test/integration/routing/users_test.rb
test/integration/routing/versions_test.rb
test/integration/routing/watchers_test.rb
test/integration/routing/welcome_test.rb
test/integration/routing/wiki_test.rb
test/integration/routing/wikis_test.rb
test/integration/routing/workflows_test.rb
test/integration/users_test.rb
test/object_helpers.rb
test/test_helper.rb
test/unit/changeset_test.rb
test/unit/custom_field_test.rb
test/unit/enabled_module_test.rb
test/unit/group_test.rb
test/unit/helpers/application_helper_test.rb
test/unit/helpers/projects_helper_test.rb
test/unit/initializers/patches_test.rb
test/unit/issue_nested_set_test.rb
test/unit/issue_priority_test.rb
test/unit/issue_status_test.rb
test/unit/issue_test.rb
test/unit/journal_test.rb
test/unit/lib/redmine/codeset_util_test.rb
test/unit/lib/redmine/export/pdf_test.rb
test/unit/lib/redmine/hook_test.rb
test/unit/lib/redmine/i18n_test.rb
test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
test/unit/lib/redmine/unified_diff_test.rb
test/unit/lib/redmine/wiki_formatting/macros_test.rb
test/unit/mail_handler_test.rb
test/unit/mailer_test.rb
test/unit/member_test.rb
test/unit/principal_test.rb
test/unit/project_copy_test.rb
test/unit/project_nested_set_test.rb
test/unit/project_test.rb
test/unit/query_test.rb
test/unit/repository_bazaar_test.rb
test/unit/repository_cvs_test.rb
test/unit/repository_darcs_test.rb
test/unit/repository_filesystem_test.rb
test/unit/repository_git_test.rb
test/unit/repository_mercurial_test.rb
test/unit/repository_subversion_test.rb
test/unit/repository_test.rb
test/unit/role_test.rb
test/unit/tracker_test.rb
test/unit/user_test.rb
test/unit/version_test.rb
test/unit/wiki_test.rb