meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 08:51:13 +00:00
Code Issues Releases Wiki Activity
8,059 Commits 32 Branches 194 Tags
Commit Graph

1358 Commits

Author SHA1 Message Date
Jean-Philippe Lang
fe1a152e02 Merged r9798 to r9801 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9803 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-10 13:40:02 +00:00
Jean-Philippe Lang
7b7bca0b59 Merged r9783 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9790 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-06-09 13:53:37 +00:00
Jean-Philippe Lang
5a1be1d8df Backported r9687 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9688 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-13 10:47:10 +00:00
Jean-Philippe Lang
9cfb7e1c87 Merged r9671 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9672 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-12 12:42:30 +00:00
Jean-Philippe Lang
eb53d600c9 Fixed that REST Uploads fail with fastcgi in 1.4-stable (#10832). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9653 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-08 10:39:42 +00:00
Jean-Philippe Lang
e9ac98b249 Merged r9619 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-05-04 16:58:08 +00:00
Jean-Philippe Lang
e5802895ce Merged r9417 from trunk (#10664). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9455 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-20 07:45:33 +00:00
Jean-Philippe Lang
da1a3449ce Merged r9449 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9454 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-20 06:14:32 +00:00
Jean-Philippe Lang
d6d064f875 Merged r9420 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-18 17:42:50 +00:00
Jean-Philippe Lang
6d8649b9d3 Merged r9419 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9435 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-18 17:42:09 +00:00
Jean-Philippe Lang
fd450fd2da Merged r9404, r9405 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9411 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 06:54:02 +00:00
Jean-Philippe Lang
8fefb7c05b Merged r9390 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:52:49 +00:00
Jean-Philippe Lang
1feb373c89 Merged r9378 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:51:49 +00:00
Jean-Philippe Lang
cf31aeaf81 Merged r9380 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9397 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:45:44 +00:00
Jean-Philippe Lang
83ea66fd2c Merged r9379 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:43:41 +00:00
Jean-Philippe Lang
72ecb80dc7 Merged r9358 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:27:07 +00:00
Jean-Philippe Lang
86ee285eb4 Merged r9367 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:22:31 +00:00
Jean-Philippe Lang
15ff361894 Merged r9350 and r9351 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9352 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 12:23:07 +00:00
Jean-Philippe Lang
b4975862d6 Uploading of attachments which filename contains non-ASCII chars fails with Ruby 1.9 on issue update (#10575). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 09:31:29 +00:00
Jean-Philippe Lang
bac7dff5bb Force encoding of custom field possible values (#10593). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:39:50 +00:00
Jean-Philippe Lang
f1cae4f7af WikiContent::Version#text may return ascii-8bit encoded string (#10590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:21:51 +00:00
Toshi MARUYAMA
f0f7158d87 fix typo "RedMine" at app/models/wiki_content.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9316 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-03 14:04:38 +00:00
Toshi MARUYAMA
29782860b7 scm: mercurial: git: save parents in creating changesets (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9311 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-03 08:05:30 +00:00
Toshi MARUYAMA
f36eb54141 scm: git: use Changeset#create and Changeset#create_change as same with Subversion and Mercurial 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 22:41:20 +00:00
Toshi MARUYAMA
b2a2cb68dd scm: mercurial: transaction for each imported revisions (#10470) 
Subversion transaction switched at r2563.
Subversion and Mercurial have a sequential revision number.
So, Mercurial can use the same logic with Subversion.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 16:50:10 +00:00
Toshi MARUYAMA
76435033e7 scm: git: add the comment of the reason to scan database in fetching every time (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 10:05:13 +00:00
Toshi MARUYAMA
27dca22c91 scm: git: fix typo in fetching revisions comment. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9286 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 02:42:20 +00:00
Toshi MARUYAMA
5232d379f9 scm: git: fix model source indents (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9284 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-28 17:18:19 +00:00
Toshi MARUYAMA
9b333e1c87 scm: git: process new git revisions all at once rather than per branch (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9283 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-28 17:18:04 +00:00
Jean-Philippe Lang
1294f72175 Fixed that issues can be moved to projects with issue tracking disabled (#10467). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-25 19:32:05 +00:00
Jean-Philippe Lang
5663ca89fa Fixes error message for LDAP filter (#1060). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 14:07:42 +00:00
Jean-Philippe Lang
ee8002b0c9 Adds the repository identifier in the activity and search results (#779). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9257 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 13:51:28 +00:00
Jean-Philippe Lang
bb36fa5d12 Adds the repository identifier to Changeset#text_tag (#779). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 13:03:36 +00:00
Jean-Philippe Lang
7c5635f6c6 Typo (#1913). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-17 12:19:01 +00:00
Jean-Philippe Lang
fdeb398c5e LDAP: adds the ability to bind with user's account (#1913). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-17 12:09:59 +00:00
Jean-Philippe Lang
95b10f3bd3 Don't use #delete on String in Mailer. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-12 18:34:12 +00:00
Jean-Philippe Lang
a8e392c0e5 Fixed that LDAP error is not displayed when testing connection. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-11 12:01:41 +00:00
Jean-Philippe Lang
bd47af098f Merged LdapAuthSourceController into AuthSourceController. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-11 11:43:27 +00:00
Jean-Philippe Lang
dbda62849d Removed dead code. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9176 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-10 18:20:07 +00:00
Toshi MARUYAMA
0cbbb9fda8 remove trailing white-space from app/models/repository/git.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9145 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 07:56:30 +00:00
Toshi MARUYAMA
999a4ba30d scm: git: performance improvements in fetching revisions (#8857, #9472) 
Parse a revision for a given branch,
just if we haven't parsed it for any branches before.
Moved the db check to for existing revisions into a grouped search.
Search for many revisions at once: this reduces db load.
Revisions are grouped into sets of 100.
This is to improve memory consumption.
There will be just one query instead of each 100.
The above two methods significantly increase parsing speed.
Test case was a git repo with 6000+ commits on a master branch,
and several other branches originating for master.
Speed improved from 1.4h to 18min.

Contributed by Gergely Fábián.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9144 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 07:56:15 +00:00
Toshi MARUYAMA
bcba955456 scm: git: reduce saving heads times in fetching revisions (#8857, #9472) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9143 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 05:57:59 +00:00
Toshi MARUYAMA
f0987e4b8f scm: git: backout r8839 (#8857) 
call "git log" only once instead of per branch in fetching revisions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9142 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 05:57:44 +00:00
Toshi MARUYAMA
374c2aa705 scm: git: backout r8840 (#8857, #9472) 
reduce saving heads times in fetching revisions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9141 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 05:57:29 +00:00
Jean-Philippe Lang
2bcf9f2871 Prevent mass-assignment when adding/updating a forum (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9140 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 21:36:28 +00:00
Jean-Philippe Lang
87356648f6 Set user_id as a protected attribute (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9139 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 20:57:33 +00:00
Jean-Philippe Lang
efddab48be Prevent mass-assignment when adding/updating a wiki (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9138 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 20:34:38 +00:00
Jean-Philippe Lang
fef2e4b672 Prevent mass-assignment when adding/updating a version (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9137 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 20:31:45 +00:00
Jean-Philippe Lang
1ec2d98c14 Prevent mass-assignment when adding/updating a time entry (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9136 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 20:23:00 +00:00
Jean-Philippe Lang
d0356fe935 Prevent mass-assignment when adding/updating a news (#10390). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9134 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-06 19:50:10 +00:00