Commit Graph

7560 Commits

Author SHA1 Message Date
Toshi MARUYAMA 7f70d2faaa scm: git: add test of get revisions from disjointed histories to unit lib test (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8821 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 08:34:24 +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 a9ad2a4dcc scm: git: remove redundant comma from test_revisions_includes_master_two_revs_from_origin of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8819 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 07:39:27 +00:00
Toshi MARUYAMA f4de82510a scm: git: code cleanup "test_branches" of unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8818 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:43:42 +00:00
Toshi MARUYAMA 19909bc4c8 scm: git: add lib test to get master branch revisions from origin (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8817 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 06:05:10 +00:00
Toshi MARUYAMA 693191e8bf scm: git: add model method to get heads from extra_info branches hash (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8816 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-09 00:11:03 +00:00
Toshi MARUYAMA 34b3a9851f scm: git: add includes and excludes options to lib revisions method (#8857)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8815 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 23:38:35 +00:00
Toshi MARUYAMA adb81b1ff6 scm: git: split fetch_changesets method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8814 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 11:10:46 +00:00
Toshi MARUYAMA f319409abc scm: git: remove unused "--all" option of "git log" in lib revisions method
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8813 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:18:20 +00:00
Toshi MARUYAMA 40a37b194d scm: git: use explicit "master" instead of all for revisions method at unit lib test
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8812 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:04:03 +00:00
Toshi MARUYAMA 186abba94b code layout cleanup test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8811 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-08 03:03:39 +00:00
Toshi MARUYAMA ed8f988a9b scm: git: use explicit "master" for latest_changesets at unit app test
If revision is not set, controller sets default branch for latest_changesets.
"git log" returns HEAD on bare repository if revision is not set.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-07 23:27:51 +00:00
Toshi MARUYAMA 1489623584 scm: git: remove "test_getting_certain_revisions" from unit lib test
Redmine does not use '899a15d^' syntax.
This test is covered by "test_revisions_master_merged_rev".

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8809 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-07 15:40:56 +00:00
Toshi MARUYAMA 75dd5084f6 Bulgarian translation for trunk updated by Ivan Cenov (#10160)
changed:
* setting_commit_cross_project_ref
added:
* permission_manage_related_issues

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8807 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 23:16:16 +00:00
Toshi MARUYAMA a3f9209379 Bulgarian translation for 1.3-stable updated by Ivan Cenov (#10160)
added:
* setting_repositories_encodings
changed:
* setting_cache_formatted_text

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8806 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 23:15:52 +00:00
Jean-Philippe Lang cdcf813fa7 Adds membership ids to /users/:id API response.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 16:32:50 +00:00
Jean-Philippe Lang dfbab5d61e Fixed "can't convert Fixnum into String" error on projects with numerical identifier (#10135).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8804 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 14:44:40 +00:00
Jean-Philippe Lang 6f1d553cff Typo
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8803 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 11:33:39 +00:00
Jean-Philippe Lang fd4071fadb Updates for 1.3.1 release.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8800 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 11:14:52 +00:00
Jean-Philippe Lang be246de161 Adds a simple API for listing roles (#9725).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8799 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 10:06:32 +00:00
Jean-Philippe Lang c5665276b7 REST API for project memberships (#7420).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8798 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 09:47:10 +00:00
Toshi MARUYAMA 942651ecdf Russian translation changed by Igor Zubkov (#10155)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8797 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 05:26:16 +00:00
Toshi MARUYAMA d2216bfe54 scm: fix revision graph height is hard-coded (#9832)
Contributed by Jakob Skjerning.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8795 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-06 02:58:34 +00:00
Toshi MARUYAMA 2ef86a2f0a code layout cleanup app/views/repositories/_related_issues.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8794 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:51:26 +00:00
Toshi MARUYAMA d360ca4e14 code layout cleanup app/views/wiki/edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8793 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:51:03 +00:00
Toshi MARUYAMA 297d4f8bab replace tabs to spaces at app/views/wiki/edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8792 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:50:36 +00:00
Toshi MARUYAMA e0b0f1315b replace tabs to spaces at app/views/issues/_conflict.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8791 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:50:01 +00:00
Toshi MARUYAMA adbe4097b3 replace tabs to spaces at app/views/issues/_edit.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 23:49:19 +00:00
Jean-Philippe Lang 78bd24c6f7 Resourcified project memberships.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8789 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 16:35:27 +00:00
Jean-Philippe Lang 229b2f8d2a Removed bigdecimal-segfault-fix.rb now that ruby is fixed (#7826).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8788 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 14:38:12 +00:00
Jean-Philippe Lang 001b255b08 Ability to edit a wiki page's parent on the edit page (#6449).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8787 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 14:35:27 +00:00
Jean-Philippe Lang 6c27093a8b Fixed an assertion for ruby1.9.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8786 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 13:48:16 +00:00
Jean-Philippe Lang 967f42aa98 Adds a X-Redmine-Sender header to email notifications (#5643).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8785 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:57:19 +00:00
Jean-Philippe Lang f52f18c281 Removed unsafe attributes assignment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8784 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:21:21 +00:00
Jean-Philippe Lang 4128a8bfd0 Removed mocha availability checks in tests.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8783 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:20:41 +00:00
Jean-Philippe Lang 9f6496b0bc Fixed registration form broken by r8479.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8782 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 12:17:29 +00:00
Jean-Philippe Lang d57fbc9512 Fixed: Can't attach more than 1 file on IE 6 and 7 (#10115).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8780 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 11:54:38 +00:00
Toshi MARUYAMA 232fca78a2 scm: rename JavaScript "branchGraph" function name to "revisionGraph"
"Branch" is not a common concept in the SCMs.

Mercurial "branch" has three terms.
* named branch
* unnamed branch (multiple heads)
* big-picture branch (cloning repository)

Git "branch" is a reference to a specific revision.

It is popular that Mercurial GUI shows all revisions on the top page.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8779 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 11:51:43 +00:00
Jean-Philippe Lang a00f04886f Increase username length limit from 30 to 60 (#2719).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8778 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 11:50:53 +00:00
Jean-Philippe Lang 1d4ef8964d Adds a "Manage related isses" permission to add/remove commits/issues relations manually from the changeset view (#2009).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8777 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 10:56:27 +00:00
Toshi MARUYAMA c4ea429acb Bulgarian translation updated by Ivan Cenov (#10154)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8776 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-05 01:44:43 +00:00
Jean-Philippe Lang ddc3814d45 Fixes assertion.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8775 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 20:08:05 +00:00
Jean-Philippe Lang fb3b904b8f Better handling of issue update conflicts (#8691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8774 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 17:36:15 +00:00
Etienne Massip b9c26d6ddc Revision graph code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8773 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 14:02:31 +00:00
Toshi MARUYAMA be050be5e5 replace tabs to spaces at public/help/wiki_syntax_detailed.html
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8772 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:48:02 +00:00
Jean-Philippe Lang 06f8c4b27a Removed useless code.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8771 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:41:43 +00:00
Jean-Philippe Lang 333a6cc370 Fixed rounding issue on spent hours column in CSV export (#10150).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8764 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 11:03:44 +00:00
Toshi MARUYAMA 2789cf2506 attachment: fix that diff type is not saved in user preference (#10152)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-04 06:23:38 +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
Toshi MARUYAMA 3b75e9f90a remove Korean yaml comment header
It is too hard to maintain.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8758 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-02 23:27:46 +00:00