Commit Graph

44 Commits

Author SHA1 Message Date
Holger Just 0c87f611e9 Merge branch 'master' into unstable
Conflicts:
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fa.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
Holger Just e95b4992e4 Update copyright for 2012
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
Eric Davis 3df729e47d Replace puts and !!! messages with pending tests when the test SCMs are missing 2011-12-27 18:23:14 -08:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Felix Schäfer ff431e8ed4 Force changeset journal creation. 2011-04-20 23:49:21 +02:00
Toshi MARUYAMA 515dcdc5a5 scm: git: strict Ruby 1.9 string test in unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5163 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:43:07 -07:00
Toshi MARUYAMA 0b862978f4 scm: git: add tests for previous and next versions in unit model test (#7821, #5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5074 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:36:08 -07:00
Toshi MARUYAMA aebcad6e4d scm: git: unit model latin-1 path encoding test passes on Japanese Windows (#5251).
Ruby uses ANSI api to fork a process on Windows.
Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
and these are incompatible with ASCII.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5072 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:36:08 -07:00
Toshi MARUYAMA ee003a6c78 scm: git: add latin-1 encoding directory test in unit model test (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5063 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 2ebb117044 scm: git: add latin-1 encoding directory to test repository (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5060 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA ed9596a563 scm: git: add latest changesets path encoding test in unit model test (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5058 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA f747d0a866 scm: git: prepare path encoding test in unit model test (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5057 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA e491051adb scm: git: add latest changesets branch test in unit model test (#5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5056 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 2739192a1d scm: git: add latest changesets tag test in unit model test (#5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5055 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 8bf4be1c22 scm: git: add latest changesets limit test in unit model test (#5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5054 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 132c4f58b0 scm: git: remove Setting.commit_logs_encoding from unit model test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA a2aa2a39cf scm: git: add latest changesets test in unit model test (#5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5052 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 8235e0f4a6 scm: git: prepare path encoding test in unit model test (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5051 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA 38bfb7dae9 scm: git: update test repository for path encoding (#5251).
Mercurial and Git treats file names as byte string.
This git test repository contains Latin-1 encoding path.
Be careful on non Latin-1(CP1252) Windows.

Please see r4996 comment.

I removed a revision including "copied file" from r5026 test repository.
Mercurial supports "copy", but Git does not support.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5033 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:15 -07:00
Toshi MARUYAMA 32fa37f49a scm: git: backout r5026 (#5251).
In case git repository contains latin-1 path,
although Redmine uses "git log -C core.quotepath=false --encoding=UTF-8",
log encoding is latin-1.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Toshi MARUYAMA a24be0ee87 scm: git: update test repository for path encoding (#5251).
Mercurial and Git treats file names as byte string.
This git test repository contains Latin-1 encoding path.
Be careful on non Latin-1(CP1252) Windows.

Please see r4996 comment.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Toshi MARUYAMA c54cd8a088 scm: git: add more tests in fetch changesets incremental unit model test (#5357).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:22:35 -07:00
Toshi MARUYAMA 515e89dd40 scm: git: use --encoding=UTF-8 in "git log" (#3396).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:24 -07:00
Toshi MARUYAMA 25d98527bd scm: git: add utf-8 log test in app unit test (#3396).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:24 -07:00
Toshi MARUYAMA f0d4b2625b scm: git: change project id of unit app test from 1 to 3.
Project id 1 has Subversion fixtures.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4850 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
Toshi MARUYAMA 98b3a50657 scm: fix error on revision page for empty revision (#7307).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-13 12:04:30 +00:00
Toshi MARUYAMA e92cd2091c scm: fix assert_equal parameter order in subversion and git unit test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4691 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 15:23:22 +00:00
Toshi MARUYAMA 8487e0a5b8 Fix subversion and git activities test reffering r4621.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4623 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-03 10:44:23 +00:00
Toshi MARUYAMA 2e1bcb2abf Changing revision label and identifier at SCM adapter level (#3724, #6092)
Contributed by Yuya Nishihara.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4613 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 09:45:05 +00:00
Jean-Baptiste Barth 17f86d964f Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 23:24:34 +00:00
Eric Davis ffb3d9260a Support leading and trailing spaces in filenames or directories in the git adapter. #6499
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 21:54:52 +00:00
Eric Davis bd51119460 Support spaces in the files or directories in the git adapter. #6054
Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 19:07:46 +00:00
Eric Davis 56af944afa Extend changes.path and changes.from_path to support longer paths. #5771
Long paths to SCM files would be truncated or wouldn't insert into some
databases.  This extends those fields to support arbitrary length filenames.

Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3828 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-06 02:07:46 +00:00
Jean-Philippe Lang 87bc092d7c Removes --find-copies-harder git option to retrieve commits which was way to slow (#4547).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3468 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-21 14:37:09 +00:00
Eric Davis 7b0cb6aba8 Upgraded to Rails 2.3.4 (#3597)
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-13 17:14:35 +00:00
Eric Davis c28b044d68 Added branch and tag support to the git repository viewer. (#1406)
Many thanks to Adam Soltys and everyone else who tested this patch.

* Updated git test repository so it has a branch with some differences from the master branch
* Moved redmine diff class into a module so as not to clash with diff-lcs gem which is required by grit
* Find changesets from all branches, not just master
* Got revision browsing working
* Got file actions working properly
* Allow browsing by short form of commit identifier
* Added a method to retrieve repository branches
* Allow browsing by branch names as well as commit numbers
* Handle the case where a git repository has no master branch
* Expand revision box and handle finding revisions by first 8 characters
* Added branches dropdown to repository show page
* Combined repository browse and show into a single action.  Moved branch/revision navigation into a partial.
* Renamed partial navigation -> breadcrumbs
* Made it so latest revisions list uses branch and path context
* Preserve current path when changing branch or revision
* Perform slightly more graceful error handling in the case of invalid repository URLs
* Allow branch names to contain periods
* Allow dashes in branch names
* Sort branches by name
* Adding tags dropdown
* Need to disable both branches and tags dropdowns before submitting revision form
* Support underscores in revision (branch/tag) names
* Making file history sensitive to current branch/tag/revision, adding common navigation to changes page
* Updated translation files to include labels for 'branch', 'tag', and 'view all revisions'
* Reenable fields after submit so they don't look disabled and don't stay disabled on browser back button
* Instead of dashes just use empty string for default dropdown value
* Individual entry views now sport the upgraded revision navigation
* Don't display dropdowns with no entries
* Consider all revisions when doing initial load
* Fixed bug grabbing changesets.  Thanks to Bernhard Furtmueller for catching.
* Always check the entire log to find new revisions, rather than trying to go forward from the latest known one
* Added some cleverness to avoid selecting the whole changesets table any time someone views the repository root
* File copies and renames being detected properly
* Return gracefully if no revisions are found in the git log
* Applied patch from Babar Le Lapin to improve Windows compatibility

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2840 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-08-15 22:41:40 +00:00
Jean-Philippe Lang 79c33bbc83 Maps repository users to Redmine users (#1383).
Users with same username or email are automatically mapped. Mapping can be manually adjusted in repository settings. Multiple usernames can be mapped to the same Redmine user.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2006 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-10 18:59:06 +00:00
Jean-Philippe Lang 6157d20ec0 Git adapter: use commit time instead of author time (#2108).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1999 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-09 12:07:35 +00:00
Jean-Philippe Lang 8236563d6b Check that git changeset is not in the database before creating it (#1419).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-10-25 10:23:29 +00:00
Jean-Philippe Lang 116091a1d2 Fixes platform determination under JRuby (#1804).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-08-25 11:01:37 +00:00
Jean-Philippe Lang 3a9b0988c7 Merged Git support branch (r1200 to r1226).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1236 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-03-12 20:28:49 +00:00