Commit Graph

89 Commits

Author SHA1 Message Date
Jean-Philippe Lang
2d1866d966 Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-10-22 17:37:16 +00:00
Toshi MARUYAMA
1944473eee remove unneeded trailing ';' from test/functional/repositories_git_controller_test.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@13131 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-05-07 08:25:00 +00:00
Toshi MARUYAMA
35cc911192 update copyright year (#15977)
Contributed by Daniel Felix.

git-svn-id: http://svn.redmine.org/redmine/trunk@12736 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-29 22:45:39 +00:00
Toshi MARUYAMA
abd6471270 Rails4: replace deprecated Relation#first with finder options at RepositoriesGitControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12641 e93f8b46-1217-0410-a6f0-8f06a7374b81
2014-01-11 10:13:37 +00:00
Toshi MARUYAMA
5aa8358f97 scm: fix annotate error with non ASCII author on Ruby 1.9 and Ruby 2.0 (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12156 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 14:22:44 +00:00
Toshi MARUYAMA
bf0676e17a scm: git: fix indents of non ASCII path annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12153 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 13:23:09 +00:00
Toshi MARUYAMA
9c9b5e471c use assert_select instead of assert_tag in Git non ASCII path annotate test (#14931)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12150 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-09-18 10:36:38 +00:00
Jean-Philippe Lang
e396a0eebe Copyright for 2013 (#12788).
Patch by Daniel Felix.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-01-12 09:29:31 +00:00
Toshi MARUYAMA
c4ce048970 fix "Page not found" on OK button in SCM "View all revisions" page (#12196)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10709 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-24 09:24:30 +00:00
Toshi MARUYAMA
69b8931e92 add functional test of sub repository diff path (#11966)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10503 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 03:43:51 +00:00
Toshi MARUYAMA
69a3941ac8 add functional test of main repository diff path (#11966)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10502 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 03:43:25 +00:00
Toshi MARUYAMA
086478c5a6 set user preference diff type nil at functional tests
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10501 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-28 02:02:30 +00:00
Toshi MARUYAMA
1efd303b4a scm: git: use with_settings instead of assigned setting at functional test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10498 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-27 23:16:56 +00:00
Jean-Philippe Lang
12de6a177a Fixed that git diff displays deleted files as /dev/null (#11868).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 19:32:58 +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
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
71c5d6c8ee Use assert_select instead of assert_tag.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10106 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-28 18:16:55 +00:00
Jean-Philippe Lang
65524cc1cc Don't repeat revision on annotate view.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10105 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-28 18:11:03 +00:00
Jean-Philippe Lang
8e1f7607ec Identifier is now frozen.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10082 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-26 18:41:44 +00:00
Jean-Philippe Lang
7acd04fb87 Tests should not change settings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9949 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-08 12:23:47 +00:00
Jean-Philippe Lang
2311f80c5d Fix: Unable to run unit and functional tests if git binary is not available.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9861 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-18 18:33:33 +00:00
Toshi MARUYAMA
ba25d27e3a scm: git: skip Latin-1 path tests on Git for Windows above 1.7.10
Git for Windows (msysGit) changed internal API from ANSI to Unicode in 1.7.10.
http://code.google.com/p/msysgit/issues/detail?id=80

So, Latin-1 path tests fail on Japanese Windows

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9750 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-02 18:36:23 +00:00
Jean-Philippe Lang
ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Toshi MARUYAMA
2c28d6b5d1 scm: git: fix creating and updating repository
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-03 11:48:33 +00:00
Toshi MARUYAMA
08811bd259 Rails3: test: scm: git: use "repository_path_hash" for path param
Rails3 new route format returns path param as string not array.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8924 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-23 06:12:22 +00:00
Toshi MARUYAMA
e34dab7443 scm: git: update test repository (#8857)
New disjointed history revisions are added.
This test repository has two origins.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:20:37 +00:00
Toshi MARUYAMA
af50c1e13e scm: git: add test that diff type is saved in user preference (#10152)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8760 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 06:23:00 +00:00
Jean-Philippe Lang
fb1a2fd7cd Resourcified repositories for CRUD operations to prepare for multiple SCM per project (#779).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8648 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-15 14:23:06 +00:00
Jean-Philippe Lang
4eb14ab85c Test for repository edit and cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8050 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-03 15:09:08 +00:00
Toshi MARUYAMA
4ae7f82f3a do not annotate text files which exceed the size limit for viewing (#9484)
Contributed by Antonio García-Domínguez.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7728 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-05 03:47:03 +00:00
Toshi MARUYAMA
5bf47d1eb8 Rails3: scm: git: fix error of test_destroy_invalid_repository at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7146 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 03:00:14 +00:00
Toshi MARUYAMA
15b87ae359 Rails3: scm: git: fix error of test_destroy_valid_repository at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7145 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:59:43 +00:00
Toshi MARUYAMA
fe6d58f918 Rails3: scm: git: fix error of test_empty_revision at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7144 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:59:08 +00:00
Toshi MARUYAMA
4ff3d0d639 Rails3: scm: git: fix error of test_revision at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7143 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:58:33 +00:00
Toshi MARUYAMA
117ebf2d65 Rails3: scm: git: fix error of test_annotate_at_given_revision at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7142 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:58:06 +00:00
Toshi MARUYAMA
a6193f90e3 Rails3: scm: git: fix error of test_diff_two_revs at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7141 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:57:34 +00:00
Toshi MARUYAMA
14386007f5 Rails3: scm: git: fix error of test_diff_truncated at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7140 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:56:54 +00:00
Toshi MARUYAMA
a318414712 Rails3: scm: git: fix error of test_diff at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7139 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:56:23 +00:00
Toshi MARUYAMA
1cae0ae415 Rails3: scm: git: fix error of test_browse_at_given_revision at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7138 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:55:40 +00:00
Toshi MARUYAMA
1aa077b488 Rails3: scm: git: fix error of test_browse_directory at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7130 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 02:42:23 +00:00
Toshi MARUYAMA
e47f55eccf Rails3: scm: git: fix error of test_browse_tag at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7125 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 01:13:41 +00:00
Toshi MARUYAMA
e6e8cd8650 Rails3: scm: git: fix error of test_browse_branch at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7124 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-12 01:13:03 +00:00
Toshi MARUYAMA
a4bb55700f Rails3: scm: git: fix error of test_browse_root at functional test
On Rails 3.1, ActiveRecord::HasManyThroughCantAssociateThroughHasOneOrManyReflection error raises.
For more details, see r7062.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7110 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-11 23:16:10 +00:00
Toshi MARUYAMA
7c579d13af scm: git: define NUM_REV as the number of test repository revisions at functional test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7109 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-11 23:15:28 +00:00
Toshi MARUYAMA
06be9ebac4 scm: git: add functional test of destroying invalid repository (#6713, #4725).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-11 01:10:21 +00:00
Toshi MARUYAMA
c077f0cde1 scm: git: add functional test of destroying valid repository (#6713, #4725).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6249 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-11 01:09:34 +00:00
Toshi MARUYAMA
61e6dc0a48 scm: git: add instance variable @project at functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-11 01:08:56 +00:00
Toshi MARUYAMA
c8ec7820db scm: git: add missing "assert" changesets and entries size at functional test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6222 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-07-10 13:10:48 +00:00
Jean-Baptiste Barth
115d227298 Do not cache I18n strings when truncating a long diff (#5089).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6073 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-06-13 22:09:01 +00:00