Commit Graph

3050 Commits

Author SHA1 Message Date
Jean-Philippe Lang d02e5e54a8 Merged r10580 and r10581 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10722 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-26 03:13:34 +00:00
Toshi MARUYAMA c050028102 Merged r10709 from trunk to 2.1-stable (#12196)
fix "Page not found" on OK button in SCM "View all revisions" page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10710 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 10:22:17 +00:00
Toshi MARUYAMA 21b162a624 Merged r10689 from trunk to 2.1-stable
Partial backout r10263.

Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:24:01 +00:00
Toshi MARUYAMA b7e999d1aa Merged r10688 from trunk to 2.1-stable
Backout r10253.

Backout replacing shoulda context of test/unit/helpers/issues_helper_test.rb.
Test methods in shoulda context do not run on Ruby 1.8.7-p370.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10690 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-22 03:23:28 +00:00
Toshi MARUYAMA 3b4126e14f Merged r10572 from trunk
add missing fixtures to test/unit/issue_relation_test.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10577 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 11:56:45 +00:00
Toshi MARUYAMA 46a76ecb6e Merged r10571 from trunk
add missing fixture to test/integration/api_test/issues_test.rb

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-09 11:56:31 +00:00
Jean-Philippe Lang 2df7c0ff3a Merged r10465 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10534 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-30 08:33:25 +00:00
Jean-Philippe Lang 1f80a4b0d9 Merged r10433, r10437 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10526 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:38:53 +00:00
Jean-Philippe Lang daea57a37c Merged r10438 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10524 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:32:11 +00:00
Jean-Philippe Lang fe61739108 Merged r10494 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10523 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-29 16:31:13 +00:00
Toshi MARUYAMA aac3e1e51c Merged r10503 from trunk to 2.1-stable (#11982, #11966)
add functional test of sub repository diff path.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10511 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 06:38:50 +00:00
Toshi MARUYAMA 595fef0d68 Merged r10502 from trunk to 2.1-stable (#11982, #11966)
add functional test of main repository diff path.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10510 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 06:38:23 +00:00
Toshi MARUYAMA f27a0eca5b Merged r10501 from trunk
set user preference diff type nil at functional tests.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10505 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 03:54:07 +00:00
Toshi MARUYAMA 2d34ab9235 Merged r10498 from trunk
scm: git: use with_settings instead of assigned setting at functional test

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10499 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 00:17:59 +00:00
Toshi MARUYAMA 9095874a07 Merged r10478 from trunk
use set_language_if_valid 'en' at test_parent_should_be_in_same_project at unit board test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-26 11:59:44 +00:00
Toshi MARUYAMA 8ecfd1dcf8 Merged r10477 from trunk
set default_language en at test_commit_closing_a_subproject_issue of unit changeset test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10481 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-26 11:59:19 +00:00
Toshi MARUYAMA 35584bc53a Merged r10476 from trunk (#11922)
fix number_to_currency() raises exception on Rails3 bs and de locale.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10479 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-26 11:09:24 +00:00
Toshi MARUYAMA d1606fd3e3 add asserting that issue estimated hours is nil when creating minimal issue
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10363 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 14:13:11 +00:00
Toshi MARUYAMA 2461d12388 gantt: remove redundant empty lines from unit gantt helper test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-11 02:58:59 +00:00
Jean-Philippe Lang 62d5b4c710 Issues assigned to a locked/closed version are now copied (#11207).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10336 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 11:04:55 +00:00
Jean-Philippe Lang 197a14a82e Fixed that the reminder email excludes issues assigned to groups (#11723).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10335 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 11:02:13 +00:00
Jean-Philippe Lang ff86c37ed3 Fixed: Issues associated with a locked version are not copied when copying a project (#11207).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10334 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 10:11:49 +00:00
Jean-Philippe Lang 5e9320137b Fixed that target version is lost on project copy for issues that are assigned to a shared version from another project.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10333 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-09 10:01:03 +00:00
Jean-Philippe Lang b72d40a429 Do not copy subtasks twice when copying an issue and its descendants (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10329 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 06:14:35 +00:00
Jean-Philippe Lang 6a37151b5c Adapt subtasks copy when copying a project (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10328 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 05:56:48 +00:00
Jean-Philippe Lang 5003927f13 Option to copy subtasks when copying issue(s) (#6965).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-08 05:34:07 +00:00
Jean-Philippe Lang ca7498c2d6 Create role by copy (#9258).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-03 17:04:28 +00:00
Jean-Philippe Lang 3a32edc3bd Adds a view for editing all trackers fields.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10283 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 16:55:16 +00:00
Toshi MARUYAMA e1492f771c remove redundant empty lines from test/test_helper.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 11:09:56 +00:00
Jean-Philippe Lang 8b72710d7e Fixed: New multi-line macros regexp is too eager (#11736).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:24:56 +00:00
Jean-Philippe Lang 265baa1b2c Upgrade to Rails 3.2.8 (#11758).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:08:51 +00:00
Toshi MARUYAMA e4b7b7cc38 code cleanup test_with_a_start_date_attribute_* of unit IssuesHelperTest
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10264 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 05:33:43 +00:00
Toshi MARUYAMA 8eb39d682d replace shoulder "with a due_date attribute" context of unit IssuesHelperTest and use with_settings
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10263 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 05:33:28 +00:00
Toshi MARUYAMA 4bca584024 use date_format setting at unit IssuesHelperTest test_with_a_start_date_attribute_*
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10257 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 04:10:33 +00:00
Toshi MARUYAMA 935d8e594b add missing fixtures to test/unit/lib/redmine/hook_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10256 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 03:47:20 +00:00
Toshi MARUYAMA 374a0cc7cb add missing fixture to test/unit/lib/redmine/safe_attributes_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10255 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 02:55:13 +00:00
Toshi MARUYAMA 53dd8dc11a add unit query test of French label
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10254 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 02:37:20 +00:00
Toshi MARUYAMA 444987ce91 replace shoulder "with a start_date attribute" context of test/unit/helpers/issues_helper_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10253 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 02:23:59 +00:00
Toshi MARUYAMA 43add0d306 scm: git: use with_settings at test_diff_truncated of functional test (#11752)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10252 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 02:23:44 +00:00
Toshi MARUYAMA 3581782ec2 scm: git: use diff_max_lines_displayed setting at test_diff_with_rev_and_path of functional test (#11752)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10251 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 02:23:29 +00:00
Toshi MARUYAMA 8d4c0e5ecd set language en to test_label_for at test/unit/query_test.rb
Test on CI Server fails.

http://www.redmine.org/builds/logs/build_trunk_sqlite3_ruby-1.9.3-p194_581.html

<pre>
Failure:
  <"Assignee">("US-ASCII") expected but was
  <"Assigné à">("UTF-8").
test_label_for(QueryTest)
test/unit/query_test.rb:860:in `test_label_for'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-01 01:29:48 +00:00
Toshi MARUYAMA 6ea1bc725a scm: git: add functional test of diff with revision and path (#11752)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10245 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-31 22:22:26 +00:00
Jean-Philippe Lang a7be337a4c Updates test for r10243.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-27 11:21:08 +00:00
Jean-Philippe Lang d33fa1f8c8 Do not build a projects_by_role Hash that gets updated when accessing a key that is not present (#11662).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10242 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-27 10:11:20 +00:00
Jean-Philippe Lang c68ee7f545 Fixed that destroying a user from the edit page returns a 404 response (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10240 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 10:50:59 +00:00
Jean-Philippe Lang ebc979e9b1 Do not use escaped back_url param (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 10:40:09 +00:00
Jean-Philippe Lang 3cc6d5e815 Reverted r10234 and r10235 that broke redirect after login (#11691).
Tests in account_controller_test.rb should not have been changed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10238 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 09:29:48 +00:00
Jean-Philippe Lang 5969df8142 MailHandler: Match assignee on the full display name (#11552).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 09:03:17 +00:00
Etienne Massip 2ed4364c8a Reverted changes made to tests for r1893 (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10235 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-24 21:41:52 +00:00
Toshi MARUYAMA a1d8cab6c6 remove empty setup method from unit enumeration test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10232 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-22 16:31:26 +00:00