kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,207 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

10207 Commits

Author SHA1 Message Date
Jean-Philippe Lang 3096b6183e Set version to 2.4.0. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12263 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 11:21:21 +00:00
Jean-Philippe Lang 6ccdee7713 Fixed that rake db:create fails with JRuby (#15218). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 10:33:35 +00:00
Toshi MARUYAMA ccf55e65f0 ci.rake: use 'jdbcsqlite3' for JRuby 
git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 08:17:49 +00:00
Toshi MARUYAMA 0707c7a12d ci.rake: code format cleanup 
git-svn-id: http://svn.redmine.org/redmine/trunk@12257 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 08:17:40 +00:00
Toshi MARUYAMA 882c4495c0 work around "rake db:create:all" error on JRuby SQLite3 
<pre>
$ bundle exec rake ci --trace
...
rake aborted!
stack level too deep
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)'
org/jruby/RubyHash.java:1375:in `each_value'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)'
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12256 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-10 00:19:17 +00:00
Toshi MARUYAMA 303fdc2913 remove trailing white-spaces from test/unit/project_members_inheritance_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:47:40 +00:00
Toshi MARUYAMA b96941763d upgrade activerecord-jdbc-adapter to 1.3.2 
git-svn-id: http://svn.redmine.org/redmine/trunk@12254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 16:44:44 +00:00
Toshi MARUYAMA 44012ec6c6 remove trailing white-spaces from test/unit/query_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12253 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 13:10:19 +00:00
Toshi MARUYAMA 979d3400ab remove trailing white-spaces from test/unit/setting_test.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12252 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 12:48:19 +00:00
Jean-Philippe Lang bff12254ac Custom fields in issue form - splitting is incorrect (#15227). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:19:06 +00:00
Jean-Philippe Lang d89c968bb1 Accept issue id with leading sharp when adding a related issue. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 11:09:50 +00:00
Jean-Philippe Lang f4aff7919a Log errors when moving attachments (#15295). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:46:55 +00:00
Jean-Philippe Lang 10e29f2223 Accept custom field format added at runtime (#15277). 
Patch by Boris Bera.

git-svn-id: http://svn.redmine.org/redmine/trunk@12248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 09:07:48 +00:00
Jean-Philippe Lang 1871378648 Gantt: sort versions like on the roadmap (#7335). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12247 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 08:54:45 +00:00
Jean-Philippe Lang 3661766edc Upgrade to Rails 3.2.15. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12246 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:51:00 +00:00
Jean-Philippe Lang 71b43ea1c7 Wiki Pages REST API with version returns wrong comments (#15235). 
Patch by Yukinari TOYOTA.

git-svn-id: http://svn.redmine.org/redmine/trunk@12245 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-11-09 07:42:54 +00:00
Toshi MARUYAMA 2e1f80dcde Gemfile: remove "i18n" 
activesupport 3.2.13 requires i18n 0.6.1 explicitly.
197b9f4d61

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 06:24:28 +00:00
Toshi MARUYAMA 56639689e0 back out r12241 (back out Rails version 3.2.13) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:45:44 +00:00
Toshi MARUYAMA 2cc413351a Gemfile: update Rails version 3.2.15 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-29 05:18:06 +00:00
Jean-Philippe Lang 918ec276f1 Fixed test failure (#15182). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12240 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 11:50:16 +00:00
Jean-Philippe Lang ba083225b7 Return to section anchor after wiki section edit (#15182). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 09:03:08 +00:00
Jean-Philippe Lang 7f22cc6113 Upgrade CodeRay to 1.1.0 (#8253). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:55:50 +00:00
Jean-Philippe Lang e162f87964 Replaces <option value=""></option> which is not HTML5 valid (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12237 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 08:08:45 +00:00
Jean-Philippe Lang 711982b7b3 Prevents duplicate element ids (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12236 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 07:17:02 +00:00
Jean-Philippe Lang 3578cf4d9a Replaced acronym with abbr tags (#15191). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12235 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 07:15:08 +00:00
Jean-Philippe Lang ec5dbdb0bd Fixed: JS-error while using a global custom query w/ project filter in a project context (#15190). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-26 06:56:35 +00:00
Toshi MARUYAMA 41ade07171 Simplified Chinese translation updated (#15186) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 06:06:30 +00:00
Toshi MARUYAMA 3109ed9320 code format cleanup app/models/changeset.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12231 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 05:40:32 +00:00
Toshi MARUYAMA 16b94e126b code format cleanup app/models/issue.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12230 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 05:40:21 +00:00
Toshi MARUYAMA 0552655ff5 Simplified Chinese translation for 2.3-stable updated (#15185) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12229 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-24 05:40:08 +00:00
Jean-Philippe Lang b48fcdaa97 Avoid a query if enabled_modules association is already loaded (#15058). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12228 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 16:04:04 +00:00
Jean-Philippe Lang 99bf8c95ab Fixed that issue nested set update is triggered even if parent is not changed (#15135). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12226 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 09:25:14 +00:00
Jean-Philippe Lang 13e381d31d Projects selection on custom field form (#15136). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12225 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-20 08:29:55 +00:00
Toshi MARUYAMA 4eea64d38f remove trailing white-spaces from test/unit/user_test.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12224 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-17 01:00:04 +00:00
Jean-Philippe Lang 3172359f97 Avoid N queries when displaying the issue list with custom fields. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12223 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-15 16:38:17 +00:00
Jean-Philippe Lang 758cc2f2e6 Fixed that WikiContent#next_version raises a comparison of Symbol with Arel::Table failed error (#14773). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12222 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-14 17:07:17 +00:00
Jean-Philippe Lang 699317e12e Adds some links for wiki history navigation. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12221 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-14 16:58:39 +00:00
Jean-Philippe Lang 5f747faa58 Fixed that viewing/editing a wiki page without WikiContent raises an error (#14986). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12220 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 11:19:47 +00:00
Jean-Philippe Lang 94e7df78ca Fixed that controller_issues_edit_before/after_save hooks have no controller context (#15044). 
Patch by Jordan Hollinger.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12219 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:31:04 +00:00
Jean-Philippe Lang 58c69b8123 Fixed that redmine:migrate_from_mantis fails to migrate projects with all upper case name (#15050). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12218 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:07:34 +00:00
Jean-Philippe Lang 7bea176cdb Avoid lots of CustomField.find_by_id calls when displaying an issue history with custom fields (#15072). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12217 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:04:59 +00:00
Jean-Philippe Lang 60d6e16978 Fixed that non array commit_update_keywords raises an error (#7590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12216 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 10:03:13 +00:00
Jean-Philippe Lang b071a937b3 List custom fields fielters: multiple select filter wider (#15073). 
Patch by Jérôme Bataille.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12215 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 08:42:32 +00:00
Jean-Philippe Lang 176ce78574 Fixed that the mail method should return a Mail::Message (#15113). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12210 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 07:58:33 +00:00
Jean-Philippe Lang c6c0491ad8 Migrate settings according to r12208 (#7590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12209 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 07:39:20 +00:00
Jean-Philippe Lang b6cb7aa8e3 Ability to define commit keywords per tracker (#7590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12208 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-13 07:37:49 +00:00
Toshi MARUYAMA b8aa4da28a remove unneeded "require 'diff'" from WikiController (#15105) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12207 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-11 17:37:51 +00:00
Toshi MARUYAMA 461342dd2e add missing "require 'diff'" to Redmine::Helpers::Diff (#15105) 
Contributed by Felix Bünemann.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12206 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-11 17:37:38 +00:00
Toshi MARUYAMA e7bc6364e1 add unit test of Redmine::Helpers::Diff (#15105) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12205 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-11 17:37:25 +00:00
Toshi MARUYAMA 53d749eb79 remove trailing white space from test/unit/wiki_content_test.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12204 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2013-10-10 03:56:54 +00:00