Commit Graph

3872 Commits

Author SHA1 Message Date
Jean-Philippe Lang 65c9223fe5 Merged r12990 (#16338).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-29 14:37:17 +00:00
Jean-Philippe Lang c5b52ec29f Merged r12989 and r12997 (#16236).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-29 14:35:47 +00:00
Jean-Philippe Lang 58786e8d80 Merged r12985 (#14298).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13019 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-29 14:34:28 +00:00
Jean-Philippe Lang c61a6a707f Merged r12971 (#16255).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12979 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-17 08:30:30 +00:00
Jean-Philippe Lang 4aab2ed303 Merged r12967 (#16321).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12978 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-17 08:29:20 +00:00
Jean-Philippe Lang 91a161fadb Merged r12951.
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-02 11:24:13 +00:00
Jean-Philippe Lang dbe03f5443 Merged r12944 (#16143).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12947 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-02 09:34:00 +00:00
Jean-Philippe Lang 5b1799f245 Merged r12896 (#16081).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-03-02 09:29:22 +00:00
Jean-Philippe Lang 9cb17f598d Merged r12938 (#16169).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12939 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-28 11:39:01 +00:00
Toshi MARUYAMA 41667cd5de Merged r12929 from trunk to 2.5-stable (#16177)
scm: mercurial: add one "closed" branch to test repository.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12931 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-26 13:01:43 +00:00
Jean-Philippe Lang 63212e5c16 Merged r12915 to 12918 (#16107).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:20:42 +00:00
Jean-Philippe Lang 01aa2db0af Merged r12899 (#16077).
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-23 08:10:31 +00:00
Toshi MARUYAMA 23fb42a890 use escaped "Can't" constant at MailerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12883 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-14 05:05:39 +00:00
Toshi MARUYAMA e8df3d50e8 Rails4: fix time related git adapter test failures
git-svn-id: http://svn.redmine.org/redmine/trunk@12882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-14 05:05:24 +00:00
Toshi MARUYAMA 3d79ddfe75 add missing fixtures to TimeEntryReportsControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12880 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-14 02:02:06 +00:00
Toshi MARUYAMA 49e0489bc8 Rails4: fix PreviewsControllerTest assert_template failures
<pre>
  1) Failure:
PreviewsControllerTest#test_preview_issue_notes [test/functional/previews_controller_test.rb:44]:
expecting <"preview"> but rendering with <["previews/issue"]>
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12879 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-13 08:17:04 +00:00
Toshi MARUYAMA 7a594a2c3d Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12877 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-13 06:29:34 +00:00
Toshi MARUYAMA 2fc8ede093 Rails4: replace hard-coded html with class at Redmine::WikiFormatting::MacrosTest
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-13 05:40:09 +00:00
Toshi MARUYAMA 889a5ed77a Rails4: replace hard-coded html with class at IssuesHelperTest
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-11 07:27:30 +00:00
Jean-Philippe Lang 83dae30140 Test failure with Postgresql+ruby1.8 (#2549).
git-svn-id: http://svn.redmine.org/redmine/trunk@12870 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 16:34:41 +00:00
Jean-Philippe Lang ff46e9d0a4 Makes #watcher_link return an empty string when given nil.
git-svn-id: http://svn.redmine.org/redmine/trunk@12869 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 12:04:44 +00:00
Jean-Philippe Lang 1ad33134d3 Enable the watching of news (#2549).
git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-09 11:54:21 +00:00
Toshi MARUYAMA 833068207c fix source indent of ApplicationHelperTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12857 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 12:12:09 +00:00
Jean-Philippe Lang 171581da7e Project.activities should always return a ActiveRecord::Relation (#15983).
git-svn-id: http://svn.redmine.org/redmine/trunk@12854 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 08:36:49 +00:00
Jean-Philippe Lang 7b127ee489 Show tabs for existing custom field types only and adds a view for choosing the type when adding a new custom field.
git-svn-id: http://svn.redmine.org/redmine/trunk@12849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-07 07:57:59 +00:00
Jean-Philippe Lang 09b95905dc Make sure that Repository#extra_info returns a Hash or nil (#16032).
git-svn-id: http://svn.redmine.org/redmine/trunk@12848 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 20:23:06 +00:00
Toshi MARUYAMA a0baf7ee5d fix wrong issue 'assigned-to-my-group' css class (#16038)
git-svn-id: http://svn.redmine.org/redmine/trunk@12844 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 12:16:27 +00:00
Toshi MARUYAMA 3817f1e304 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links_within_wiki_page_context
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12843 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 04:45:54 +00:00
Toshi MARUYAMA 50eed3f9ab use escaped "Can't" constant at IssuesHelperTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12842 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 04:45:38 +00:00
Toshi MARUYAMA ae7a4b9678 Rails4: add ApplicationHelper#truncate_single_line_raw method replacing truncate_single_line
git-svn-id: http://svn.redmine.org/redmine/trunk@12830 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 03:33:33 +00:00
Toshi MARUYAMA e4d152e84a add tests of ApplicationHelper#link_to_issue subject and title
git-svn-id: http://svn.redmine.org/redmine/trunk@12829 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 02:38:37 +00:00
Toshi MARUYAMA b6668e3ebf Rails4: replace hard-coded html with class at ApplicationHelperTest#test_pre_content_should_not_parse_wiki_and_redmine_links
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12828 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 01:30:45 +00:00
Toshi MARUYAMA fab81930f7 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_link_to_user_should_link_to_locked_user_if_current_user_is_admin
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12827 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 01:30:29 +00:00
Toshi MARUYAMA 54de8a19d1 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_link_to_user
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12826 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 01:30:12 +00:00
Toshi MARUYAMA 789523db5f do stricter ApplicationHelperTest#test_truncate_single_line
git-svn-id: http://svn.redmine.org/redmine/trunk@12825 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 01:29:56 +00:00
Toshi MARUYAMA fc4004d0ba add tests of ApplicationHelper#truncate_single_line
git-svn-id: http://svn.redmine.org/redmine/trunk@12824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-06 00:36:50 +00:00
Toshi MARUYAMA 325b3db186 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links_anchor_option_should_prepend_page_title_to_href
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12823 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 08:56:35 +00:00
Toshi MARUYAMA 936052f9f6 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_link_to_project
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 08:56:19 +00:00
Toshi MARUYAMA 89920d2714 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_link_to_attachment
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 08:56:03 +00:00
Toshi MARUYAMA 7928ce3797 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_cross_project_redmine_links
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 08:55:49 +00:00
Toshi MARUYAMA 0a54a50813 code format clean up ApplicationHelperTest#test_cross_project_redmine_links
git-svn-id: http://svn.redmine.org/redmine/trunk@12819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 08:55:32 +00:00
Toshi MARUYAMA 47353387c1 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_attachment_links
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 04:14:58 +00:00
Toshi MARUYAMA 79e5570b27 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_attachment_link_should_link_to_latest_attachment
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12812 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 04:14:43 +00:00
Toshi MARUYAMA 2f43fca8f0 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links_in_tables
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 04:14:27 +00:00
Toshi MARUYAMA bd6d45428f use escaped "Can't" constant at ApplicationHelperTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 00:42:50 +00:00
Toshi MARUYAMA 52b5a26507 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_redmine_links_with_a_different_project_before_current_project
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-05 00:42:34 +00:00
Toshi MARUYAMA 760f88bd58 use escaped "Can't" constant at IssueStatusesControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-04 23:52:44 +00:00
Toshi MARUYAMA 03f7281f82 use escaped "can't" constant at IssueStatusesControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-04 23:52:28 +00:00
Toshi MARUYAMA 98249335d5 use escaped "can't" constant at NewsControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-04 23:52:12 +00:00
Toshi MARUYAMA 031e4fde63 use escaped "can't" constant at ProjectsControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-02-04 23:51:56 +00:00