meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity
11,280 Commits 32 Branches 194 Tags
Commit Graph

11280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
46d4d75ccd Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13513 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-26 14:44:11 +00:00
Jean-Philippe Lang
0b6a159622 Don't rely on users fixtures. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13512 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-26 14:43:14 +00:00
Jean-Philippe Lang
b6c0e80d37 Add ci:about task to display ruby version in build output. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13511 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-26 14:11:08 +00:00
Jean-Philippe Lang
5691826491 Clear @assignable_users on reload. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13510 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 11:14:57 +00:00
Jean-Philippe Lang
2d64a22dd9 Makes Project#assignable_users return a scope that prevents 2*n queries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13509 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 11:14:16 +00:00
Jean-Philippe Lang
c0f082ad02 Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13508 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 09:35:17 +00:00
Toshi MARUYAMA
caccb57b55 Gemfile: update rbpdf to version 1.18.2 (#18176) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13506 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-25 07:09:20 +00:00
Jean-Philippe Lang
d62574badb Code cleanup, use safer #closed? 
git-svn-id: http://svn.redmine.org/redmine/trunk@13505 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 21:40:26 +00:00
Jean-Philippe Lang
67c4936908 Restores commits reverted when rails-4.1 branch was merged (#18174). 
Patch by Mischa The Evil.

git-svn-id: http://svn.redmine.org/redmine/trunk@13504 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 18:41:35 +00:00
Toshi MARUYAMA
b63123ac1e add missing fixtures to CalendarsControllerTest 
Tests fail randomly.

<pre>
  1) Error:
CalendarsControllerTest#test_cross_project_calendar:
ActionView::Template::Error: undefined method `name' for nil:NilClass
    app/helpers/issues_helper.rb:57:in `render_issue_tooltip'
    app/views/common/_calendar.html.erb:17:in `block in _app_views_common__calendar_html_erb__4084073314711523042_57686480'
    app/views/common/_calendar.html.erb:12:in `each'
    app/views/common/_calendar.html.erb:12:in `_app_views_common__calendar_html_erb__4084073314711523042_57686480'
    app/views/calendars/show.html.erb:30:in `_app_views_calendars_show_html_erb___1639405444546230501_53808060'
    test/functional/calendars_controller_test.rb:44:in `test_cross_project_calendar'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13503 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 04:13:17 +00:00
Toshi MARUYAMA
5859c10517 fix ja.yml and zh-TW.yml merge mistake of r13482 (#14534) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13502 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:48:29 +00:00
Toshi MARUYAMA
6f92548b38 remove unneeded "references" of joins 
"references" is needed for includes, but not needed for joins.

git-svn-id: http://svn.redmine.org/redmine/trunk@13501 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:18:45 +00:00
Toshi MARUYAMA
374f4dd52e use includes instead of joins at Issue#visible 
"rake test" passes all test, but following test fails on command line.

<pre>
$ ruby test/unit/issue_test.rb -n test_visible_scope_for_member_with_groups_should_return_assigned_issues

  1) Failure:
IssueTest#test_visible_scope_for_member_with_groups_should_return_assigned_issues [test/unit/issue_test.rb:321]:
Failed assertion, no message given.
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13500 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-24 02:18:28 +00:00
Jean-Philippe Lang
b43a4f048e Adds translation strings (#11702). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13499 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 21:47:13 +00:00
Jean-Philippe Lang
c2e73160da Adds a single controller for users and groups memberships and support for adding multiple projects at once (#11702). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13498 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 21:46:40 +00:00
Jean-Philippe Lang
ca5946d82e Code cleanup: use #project_condition. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13497 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 17:23:02 +00:00
Jean-Philippe Lang
41d81a09b3 Use regular AR query instead of raw SQL. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13496 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 17:22:32 +00:00
Toshi MARUYAMA
44a5eedf8f add missing fixtures to test/unit/helpers/routes_helper_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13495 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 04:55:37 +00:00
Toshi MARUYAMA
8847e3546e Spanish wiki_syntax.html translation updated by Jesus Gutierrez de la Vega (#18156) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13493 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-23 01:48:20 +00:00
Toshi MARUYAMA
be48d44fe7 reflect r13487 and r13488 svn:ignore changes to .hgignore and .gitignore (#8817) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13492 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 23:56:12 +00:00
Jean-Philippe Lang
94a491e0ca Replaced Board#topics with a regular method. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13491 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 19:40:55 +00:00
Jean-Philippe Lang
116eb8bcc7 Fixed an SQL error with SQLServer (#14534). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13490 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 19:34:00 +00:00
Jean-Philippe Lang
9b7d176e49 Adds path to plugin_assets directory in admin/info (#8817). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13489 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 19:10:12 +00:00
Jean-Philippe Lang
ec3b7b182e Set svn:ignore to * for plugin_assets subdirectories (#8817). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13488 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:56:51 +00:00
Jean-Philippe Lang
defe50dd3d Removed svn:ignore for public/plugin_assets directory (#8817). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13487 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:55:23 +00:00
Jean-Philippe Lang
fea9a8ce48 Add public/plugin_assets directory (#8817). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13486 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:54:32 +00:00
Jean-Philippe Lang
360895068e Code cleanup, use array instead of handcrafted update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13485 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:51:00 +00:00
Jean-Philippe Lang
498a34403a Removed unneeded :foreign_key option on belongs_to associations. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13484 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:41:03 +00:00
Jean-Philippe Lang
0fc1906201 Removed deprecated stuff for Redmine 3.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13483 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 18:28:33 +00:00
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
a6ec78a4dc German translation updated by Gundolf Dampf (#18157) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13479 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 08:24:22 +00:00
Toshi MARUYAMA
3e70e5c563 Spanish translation updated by Jesus Gutierrez de la Vega (#18156) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13478 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-22 07:47:13 +00:00
Jean-Philippe Lang
146af67b3c Adds a Cancel button on issue edit view (#18051). 
Patch by Marcin Świątkiewicz.

git-svn-id: http://svn.redmine.org/redmine/trunk@13477 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 20:53:07 +00:00
Jean-Philippe Lang
71351ce232 Updates for 2.6.0 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13471 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:58:59 +00:00
Jean-Philippe Lang
b01c740980 Fixed test failure with MySQL introduced by r13467. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13468 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 18:44:33 +00:00
Jean-Philippe Lang
51508f67d0 Fixed test failure with SQLServer introduced by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13467 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-21 17:47:18 +00:00
Jean-Philippe Lang
78120536b1 Fixed tests broken by r13461. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13466 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:47:43 +00:00
Jean-Philippe Lang
526623980d Fixed: German translation on "delete my account" page showing a "\n" (#18144). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13464 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 21:22:42 +00:00
Jean-Philippe Lang
cac6ebb6c5 Code cleanup, removed raw SQL queries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13461 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 19:16:09 +00:00
Toshi MARUYAMA
e23d4d9b4e pdf: define "general_pdf_fontname" at i18n yaml for multilingual environment (#13781) 
Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/trunk@13458 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 04:15:11 +00:00
Toshi MARUYAMA
92f2ab6b70 use deep_dup to prevent losing mail receiving options (#14491) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13457 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-20 04:04:38 +00:00
Jean-Philippe Lang
c4484a40c0 Use relative URL for thumbnails according to :only_path option (#18119). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13451 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-18 10:14:17 +00:00
Jean-Philippe Lang
6bdef3ca64 Ignore locales without :general_lang_name key (#18110). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13450 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-18 09:07:51 +00:00
Jean-Philippe Lang
ff9be52e45 Ability to render multiple partials with view hook (#17763). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13449 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-18 08:09:31 +00:00
Toshi MARUYAMA
2ab1a9dccd Japanese translation updated by Go MAEDA (#18069) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13439 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:50:50 +00:00
Jean-Philippe Lang
6d10e8cd13 Set version to 2.6.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13436 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-12 13:02:03 +00:00
Toshi MARUYAMA
6ac8507b3b MailHandler: Don't use String#respond_to?(:force_encoding) (#18047) 
Contributed by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:59:21 +00:00
Toshi MARUYAMA
bfe7997e38 remove unneeded instance variable assignment from ProjectNestedSetTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13430 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-08 14:20:34 +00:00
Jean-Philippe Lang
85f2074aff Reverts change in r13428, project can't be found by identifier (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:24:24 +00:00
Jean-Philippe Lang
74cd72a2d9 Fixed that preview doesn't show notes when issue project is changed (#17959). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13428 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-10-05 13:18:55 +00:00