Commit Graph

7298 Commits

Author SHA1 Message Date
Toshi MARUYAMA daae07f47c scm: git: test: lib: update branches test for Branch class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7672 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:18:28 +00:00
Toshi MARUYAMA cec6f5c3b0 scm: git: lib: return array of Branch class instead of array of strings at branches method (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7671 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:46 +00:00
Toshi MARUYAMA 033214578f scm: lib: add Branch class to abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7670 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 05:17:13 +00:00
Toshi MARUYAMA 9ff5c7034d scm: git: test: add test of parents to unit lib test (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7669 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:59:06 +00:00
Toshi MARUYAMA 36f51878a3 scm: git: lib: add parents to Revision class (#5501)
Contributed by Jan Topiński.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7668 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:58:26 +00:00
Toshi MARUYAMA 613a056ed6 scm: mercurial: test: add test of parents to unit lib test (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7667 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:57:43 +00:00
Toshi MARUYAMA 031b5bf4eb scm: mercurial: lib: add parents to Revision class (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7666 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:56:41 +00:00
Toshi MARUYAMA 0ff17efb4d scm: lib: add parents attribute to Revision class of abstract adapter (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7665 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 04:55:54 +00:00
Toshi MARUYAMA 887893601e scm: mercurial: remove unused "tags" from xml log templete
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 03:38:02 +00:00
Toshi MARUYAMA 918eac2cbd scm: mercurial: add parents to xml log template (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7663 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 02:46:38 +00:00
Toshi MARUYAMA 476c3d54b7 scm: mercurial: update test repository (#5501)
This test repository has one merged revision.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7662 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-28 01:44:12 +00:00
Toshi MARUYAMA 370de46974 scm: git: fix typo of comments about fetching revisions (#9472)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7660 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-27 01:31:56 +00:00
Toshi MARUYAMA 01d3af65b3 scm: git: recovery and improve comments of fetching from 1.1 about harmful influence that git does not have the revision number (#9472)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7658 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-27 00:35:43 +00:00
Etienne Massip ad9e486077 Make queries resources fully conform to common behavior (removed additonal routes) (#9108).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7657 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-26 18:00:56 +00:00
Etienne Massip a47979bcc2 Reverted removal of project assignment to query (#9108).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7656 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-26 17:00:16 +00:00
Toshi MARUYAMA 856b777362 show avatars on the news list (#9470)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7655 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 23:43:27 +00:00
Toshi MARUYAMA 8dc7f1d1ee scm: git: return saved revision at model "save_revision" (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7654 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 14:58:03 +00:00
Toshi MARUYAMA 55c98d4297 scm: git: use to_s for branches at model (#5501)
"scm.branches" will extend to have the revision for the branch.
no "to_s" will have a problem.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7653 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 14:57:34 +00:00
Toshi MARUYAMA 520a8e6f15 scm: mercurial: use NUM_REV instead of hard-coded number of revisions at "test_fetch_changesets_incremental" of unit model test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7652 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 10:27:42 +00:00
Toshi MARUYAMA 81ef038587 scm: mercurial: drop supporting below Mercurial 1.1 (#9465)
On November 1st 2011, Mercurial 2.0 will be released.

On Mercurial 1.1.2, unit lib test fails with following error.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 20, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 20, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 29, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 45, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 367, in _dispatch
    ret = _runcommand(ui, options, cmd, d)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 416, in _runcommand
    return checkargs()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 376, in checkargs
    return cmdfunc()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 361, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/util.py", line 715, in check
    return func(*args, **kwargs)
  File "/REDMINE-1/hg-workdir/redmine-bb-all/lib/redmine/scm/adapters/mercurial/redminehelper.py", line 149, in rhlog
    if hg.util.version() >= '1.6':
AttributeError: 'module' object has no attribute 'version'

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7650 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-25 06:10:12 +00:00
Etienne Massip 8f96f0c40d Refactor : convert queries to REST resources (also fixes #9108).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7649 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 20:19:26 +00:00
Toshi MARUYAMA 657fcd97aa add newline at end of app/views/journals/index.builder
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7648 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 11:43:12 +00:00
Toshi MARUYAMA 3a62c30f24 scm: mercurial: skip failing unit model tests on below Mercurial 1.5 (#9465)
Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7643 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:33:03 +00:00
Toshi MARUYAMA 74cbbd38d0 scm: mercurial: skip failing unit lib tests on below Mercurial 1.5 (#9465)
Tests of non ASCII nor alphabetic nor numeric *named branch* fails on below Mercurial 1.5.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7642 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:32:38 +00:00
Toshi MARUYAMA ed87fc4e66 scm: mercurial: switch rev parameter of extension rhlog() if above Mercurial 1.6 or not (#9465)
On Mercurial 1.5, following error raises.

<pre>
hg --config extensions.redminehelper=lib/redmine/scm/adapters/mercurial/redminehelper.py \
  --rhbranch default --from default --to 0

abort: unknown revision '"default"'!
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7641 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:32:06 +00:00
Toshi MARUYAMA a6d3409a5a scm: mercurial: fix extension cmdtable on Mercurial 1.5 (#9465)
Before Mercurial revision "40c06bbf58be":http://www.selenic.com/repo/hg-stable/rev/40c06bbf58be ,
following error raises.

<pre>
Traceback (most recent call last):
  File "/WEB-DOWN/hg-repo/hg-crew/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 30, in dispatch
    return _runcatch(u, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 47, in _runcatch
    return _dispatch(ui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 398, in _dispatch
    cmd, func, args, options, cmdoptions = _parse(lui, args)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/dispatch.py", line 277, in _parse
    args = fancyopts.fancyopts(args, c, cmdoptions, True)
  File "/WEB-DOWN/hg-repo/hg-crew/mercurial/fancyopts.py", line 62, in fancyopts
    for short, name, default, comment in options:
ValueError: too many values to unpack

  1) Error:
test_nodes_in_branch(MercurialAdapterTest):
Redmine::Scm::Adapters::MercurialAdapter::HgCommandAborted: hg exited with non-zero status: 1
    lib/redmine/scm/adapters/mercurial_adapter.rb:306:in `hg'
    lib/redmine/scm/adapters/mercurial_adapter.rb:234:in `nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:311:in `test_nodes_in_branch'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `each'
    test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb:304:in `test_nodes_in_branch'
</pre>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7640 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-24 09:31:36 +00:00
Toshi MARUYAMA ccda115f15 scm: view: add #to_s to changeset.author (#5501)
On Ruby 1.8.6, following error raises.

undefined method `mb_chars' for #<ActiveRecord::Associations::BelongsToAssociation:0x7f86950f3e58>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7639 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-21 13:08:11 +00:00
Toshi MARUYAMA 129dbc316d css: set nowrap of changeset author and committed_on (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7638 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-21 11:17:58 +00:00
Toshi MARUYAMA b89d563078 scm: view: truncate author with length 30 (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7637 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-21 11:17:31 +00:00
Toshi MARUYAMA 6441207199 css: set margin 0px at top and bottom of changeset ul and ol (#5501)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-21 08:19:25 +00:00
Toshi MARUYAMA 7ab4672656 replace tabs to spaces and remove trailing white-spaces at public/stylesheets/rtl.css
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7635 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 23:03:00 +00:00
Toshi MARUYAMA 85ba074b17 replace tabs to spaces and remove trailing white-spaces at public/stylesheets/context_menu.css
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7634 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 23:02:23 +00:00
Toshi MARUYAMA 05904b1b01 replace tabs to spaces at public/stylesheets/application.css
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7633 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 23:01:45 +00:00
Toshi MARUYAMA dfde5aa909 replace tabs to spaces and fix indents at public/stylesheets/jstoolbar.css
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7632 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 23:01:13 +00:00
Toshi MARUYAMA c6395f6bbd replace tabs to spaces at public/stylesheets/scm.css
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7631 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 23:00:38 +00:00
Toshi MARUYAMA 335ac4f326 code layout clean up of app/views/repositories/_dir_list_content.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7630 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-20 01:07:10 +00:00
Etienne Massip 4eed0dca15 Reverted r7628.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7629 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-18 21:19:58 +00:00
Etienne Massip 33f65c5a48 Filter out illegal values to prevent raise of PostgreSQL exceptions, restored last test part removed with r7625 (#8371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7628 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-18 17:51:21 +00:00
Etienne Massip 78a8757846 Restored valid test part removed with r7625 (#8371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7627 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-13 06:42:08 +00:00
Etienne Massip 0a67ae2ddb Removed debugging purpose command.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7626 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-13 06:19:20 +00:00
Etienne Massip 9ba1e19ec7 Removed test part failing with PostgreSQL (#8371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7625 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-13 06:18:42 +00:00
Etienne Massip a118c4ccb0 Fixed shot filter expression parsing depending upon field operators (#8371).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7624 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-12 23:45:47 +00:00
Etienne Massip 765978871d Update styles (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7623 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-10 17:38:34 +00:00
Toshi MARUYAMA 1f4ff3687c Rails3: controller: repositories: use to_s for revision parameter
On Rails 3.0 and Ruby 1.8.7, following error raises.

Error:
test_revision(RepositoriesControllerTest):
NoMethodError: undefined method `strip' for 1:Fixnum
    app/controllers/repositories_controller.rb:252:in `find_repository'
    test/functional/repositories_controller_test.rb:44:in `test_revision'

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7622 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-09 23:34:53 +00:00
Etienne Massip 8e1cf61d86 Fix failing test (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7621 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-08 13:47:25 +00:00
Etienne Massip 92fdc4240f Added missing gem spec to coderay vendored gem (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7620 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-08 13:42:02 +00:00
Etienne Massip 8c2ae427fa Update CodeRay version to 1.0 final (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7619 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-08 13:35:15 +00:00
Etienne Massip d1efb4f148 Update CodeRay version to 1.0 final (#4264).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7618 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-08 13:34:30 +00:00
Toshi MARUYAMA 6ebb5e834c Rails3: test: replace deprecated errors.on at test_moving_an_issue_to_a_descendant_should_not_validate of unit/issue_nested_set_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7617 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-07 23:54:27 +00:00
Toshi MARUYAMA 54d553b27f Rails3: model: replace deprecated errors.add_to_base at validate_issue_relation of IssueRelation
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7616 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-07 23:53:49 +00:00