# HG changeset patch # User Chris Cannam # Date 1295449462 0 # Node ID 07fa8a8b56a8c37e2b6f2d266444552f4dc8b1f5 # Parent 8661b858af72a19fc4cc0a64ce7e9ddda3f57c49 Update to Redmine trunk rev 4732 diff -r 8661b858af72 -r 07fa8a8b56a8 .svn/all-wcprops --- a/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 24 -/svn/!svn/ver/4705/trunk +/svn/!svn/ver/4731/trunk END .hgignore K 25 diff -r 8661b858af72 -r 07fa8a8b56a8 .svn/entries --- a/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk http://redmine.rubyforge.org/svn -2011-01-13T12:05:11.734883Z -4705 -tmaruyama +2011-01-16T16:36:58.753919Z +4731 +jplang has-props @@ -29,9 +29,6 @@ test dir -app -dir - .hgignore file @@ -66,6 +63,9 @@ 317 +app +dir + log dir @@ -103,9 +103,6 @@ 307 -extra -dir - README.rdoc file @@ -140,6 +137,9 @@ 208 +extra +dir + db dir @@ -155,6 +155,12 @@ script dir +doc +dir + +config +dir + .gitignore file @@ -189,12 +195,6 @@ 322 -config -dir - -doc -dir - lib dir diff -r 8661b858af72 -r 07fa8a8b56a8 app/.svn/all-wcprops --- a/app/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/app/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,5 +1,5 @@ K 25 svn:wc:ra_dav:version-url V 28 -/svn/!svn/ver/4704/trunk/app +/svn/!svn/ver/4731/trunk/app END diff -r 8661b858af72 -r 07fa8a8b56a8 app/.svn/entries --- a/app/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app http://redmine.rubyforge.org/svn -2011-01-13T12:04:51.838288Z -4704 -tmaruyama +2011-01-16T16:36:58.753919Z +4731 +jplang diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/.svn/all-wcprops --- a/app/controllers/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 40 -/svn/!svn/ver/4703/trunk/app/controllers +/svn/!svn/ver/4729/trunk/app/controllers END issues_controller.rb K 25 @@ -99,11 +99,11 @@ V 75 /svn/!svn/ver/4075/trunk/app/controllers/project_enumerations_controller.rb END -settings_controller.rb +custom_fields_controller.rb K 25 svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb +V 68 +/svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb END timelog_controller.rb K 25 @@ -111,17 +111,11 @@ V 62 /svn/!svn/ver/4511/trunk/app/controllers/timelog_controller.rb END -custom_fields_controller.rb +settings_controller.rb K 25 svn:wc:ra_dav:version-url -V 68 -/svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb -END -users_controller.rb -K 25 -svn:wc:ra_dav:version-url -V 60 -/svn/!svn/ver/4544/trunk/app/controllers/users_controller.rb +V 63 +/svn/!svn/ver/4432/trunk/app/controllers/settings_controller.rb END issue_moves_controller.rb K 25 @@ -129,6 +123,12 @@ V 66 /svn/!svn/ver/4292/trunk/app/controllers/issue_moves_controller.rb END +users_controller.rb +K 25 +svn:wc:ra_dav:version-url +V 60 +/svn/!svn/ver/4729/trunk/app/controllers/users_controller.rb +END files_controller.rb K 25 svn:wc:ra_dav:version-url @@ -141,11 +141,11 @@ V 66 /svn/!svn/ver/4573/trunk/app/controllers/application_controller.rb END -ldap_auth_sources_controller.rb +previews_controller.rb K 25 svn:wc:ra_dav:version-url -V 72 -/svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb +V 63 +/svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb END auth_sources_controller.rb K 25 @@ -153,11 +153,11 @@ V 67 /svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb END -previews_controller.rb +ldap_auth_sources_controller.rb K 25 svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb +V 72 +/svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb END search_controller.rb K 25 @@ -171,18 +171,18 @@ V 63 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb END +versions_controller.rb +K 25 +svn:wc:ra_dav:version-url +V 63 +/svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb +END issue_relations_controller.rb K 25 svn:wc:ra_dav:version-url V 70 /svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb END -versions_controller.rb -K 25 -svn:wc:ra_dav:version-url -V 63 -/svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb -END boards_controller.rb K 25 svn:wc:ra_dav:version-url @@ -235,7 +235,7 @@ K 25 svn:wc:ra_dav:version-url V 67 -/svn/!svn/ver/4703/trunk/app/controllers/repositories_controller.rb +/svn/!svn/ver/4711/trunk/app/controllers/repositories_controller.rb END admin_controller.rb K 25 diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/.svn/entries --- a/app/controllers/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/controllers http://redmine.rubyforge.org/svn -2011-01-13T12:04:30.962313Z -4703 -tmaruyama +2011-01-16T15:23:11.666065Z +4729 +jplang @@ -570,6 +570,74 @@ 856 +settings_controller.rb +file + + + + +2011-01-13T14:09:10.000000Z +98c4c9f33f038160a44752d229926c32 +2010-11-27T14:06:11.754120Z +4432 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2271 + +custom_fields_controller.rb +file + + + + +2010-09-23T14:37:44.391741Z +00272455ac5be11da48f92c4a443c538 +2010-04-03T11:54:24.331654Z +3627 +winterheart +has-props + + + + + + + + + + + + + + + + + + + + +2373 + timelog_controller.rb file @@ -604,50 +672,16 @@ 10484 -custom_fields_controller.rb +users_controller.rb file -2010-09-23T14:37:44.391741Z -00272455ac5be11da48f92c4a443c538 -2010-04-03T11:54:24.331654Z -3627 -winterheart -has-props - - - - - - - - - - - - - - - - - - - - -2373 - -settings_controller.rb -file - - - - -2011-01-13T14:09:10.000000Z -98c4c9f33f038160a44752d229926c32 -2010-11-27T14:06:11.754120Z -4432 +2011-01-19T15:03:32.000000Z +7860374d98cda03916d9b06d9ec8d370 +2011-01-16T15:23:11.666065Z +4729 jplang has-props @@ -670,7 +704,7 @@ -2271 +8474 issue_moves_controller.rb file @@ -706,40 +740,6 @@ 2441 -users_controller.rb -file - - - - -2011-01-13T14:09:10.000000Z -645856b56e687a753f1fa3037f3c4922 -2010-12-20T17:45:09.037597Z -4544 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -8193 - files_controller.rb file @@ -808,16 +808,16 @@ 15545 -previews_controller.rb +ldap_auth_sources_controller.rb file -2010-11-19T13:04:47.000764Z -c5ae4fae18159e70fd81c2487bb1daa1 -2010-09-24T16:26:46.819682Z -4174 +2010-09-23T14:37:44.395735Z +5f7b9cb2e9c8a60db58ea0833cf481c5 +2010-05-23T03:16:31.304135Z +3744 edavis10 @@ -840,7 +840,7 @@ -957 +917 auth_sources_controller.rb file @@ -876,16 +876,16 @@ 2542 -ldap_auth_sources_controller.rb +previews_controller.rb file -2010-09-23T14:37:44.395735Z -5f7b9cb2e9c8a60db58ea0833cf481c5 -2010-05-23T03:16:31.304135Z -3744 +2010-11-19T13:04:47.000764Z +c5ae4fae18159e70fd81c2487bb1daa1 +2010-09-24T16:26:46.819682Z +4174 edavis10 @@ -908,7 +908,7 @@ -917 +957 search_controller.rb file @@ -978,6 +978,40 @@ 5824 +issue_relations_controller.rb +file + + + + +2010-09-23T14:37:44.395735Z +c57448661f2eaab81c76f23d7f51e0ab +2010-03-16T15:17:47.586688Z +3591 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +2220 + versions_controller.rb file @@ -1012,40 +1046,6 @@ 6241 -issue_relations_controller.rb -file - - - - -2010-09-23T14:37:44.395735Z -c57448661f2eaab81c76f23d7f51e0ab -2010-03-16T15:17:47.586688Z -3591 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -2220 - boards_controller.rb file @@ -1324,11 +1324,11 @@ -2011-01-13T14:09:10.000000Z -91079cca88e5e1c0a5a220ebc1a3ddda -2011-01-13T12:04:30.962313Z -4703 -tmaruyama +2011-01-19T15:03:32.000000Z +9c3c92ca908cc2101e23ecbbc6f723c0 +2011-01-14T20:24:03.783512Z +4711 +jplang has-props @@ -1350,7 +1350,7 @@ -11248 +11263 admin_controller.rb file diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/.svn/text-base/repositories_controller.rb.svn-base --- a/app/controllers/.svn/text-base/repositories_controller.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/.svn/text-base/repositories_controller.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -139,7 +139,7 @@ end def revision - raise ChangesetNotFound if @rev.nil? || @rev.empty? + raise ChangesetNotFound if @rev.blank? @changeset = @repository.find_changeset_by_name(@rev) raise ChangesetNotFound unless @changeset @@ -226,7 +226,7 @@ end def show_error_not_found - render_error l(:error_scm_not_found) + render_error :message => l(:error_scm_not_found), :status => 404 end # Handler for Redmine::Scm::Adapters::CommandFailed exception diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/.svn/text-base/users_controller.rb.svn-base --- a/app/controllers/.svn/text-base/users_controller.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/.svn/text-base/users_controller.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -19,8 +19,8 @@ layout 'admin' before_filter :require_admin, :except => :show - before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership] - accept_key_auth :index, :show, :create, :update + before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership] + accept_key_auth :index, :show, :create, :update, :destroy helper :sort include SortHelper @@ -177,6 +177,15 @@ redirect_to :controller => 'users', :action => 'edit', :id => @user end + verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed } + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to(users_url) } + format.api { head :ok } + end + end + def edit_membership @membership = Member.edit_membership(params[:membership_id], params[:membership], @user) @membership.save if request.post? diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/repositories_controller.rb --- a/app/controllers/repositories_controller.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/repositories_controller.rb Wed Jan 19 15:04:22 2011 +0000 @@ -139,7 +139,7 @@ end def revision - raise ChangesetNotFound if @rev.nil? || @rev.empty? + raise ChangesetNotFound if @rev.blank? @changeset = @repository.find_changeset_by_name(@rev) raise ChangesetNotFound unless @changeset @@ -226,7 +226,7 @@ end def show_error_not_found - render_error l(:error_scm_not_found) + render_error :message => l(:error_scm_not_found), :status => 404 end # Handler for Redmine::Scm::Adapters::CommandFailed exception diff -r 8661b858af72 -r 07fa8a8b56a8 app/controllers/users_controller.rb --- a/app/controllers/users_controller.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/controllers/users_controller.rb Wed Jan 19 15:04:22 2011 +0000 @@ -19,8 +19,8 @@ layout 'admin' before_filter :require_admin, :except => :show - before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership] - accept_key_auth :index, :show, :create, :update + before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership] + accept_key_auth :index, :show, :create, :update, :destroy helper :sort include SortHelper @@ -177,6 +177,15 @@ redirect_to :controller => 'users', :action => 'edit', :id => @user end + verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed } + def destroy + @user.destroy + respond_to do |format| + format.html { redirect_to(users_url) } + format.api { head :ok } + end + end + def edit_membership @membership = Member.edit_membership(params[:membership_id], params[:membership], @user) @membership.save if request.post? diff -r 8661b858af72 -r 07fa8a8b56a8 app/helpers/.svn/entries --- a/app/helpers/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/helpers/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/helpers http://redmine.rubyforge.org/svn @@ -536,40 +536,6 @@ 10511 -gantt_helper.rb -file - - - - -2010-11-19T13:04:46.900732Z -dfac5226f31c3c232d7dcc9416172071 -2010-10-23T09:08:55.877887Z -4283 -jplang - - - - - - - - - - - - - - - - - - - - - -1988 - queries_helper.rb file @@ -604,6 +570,40 @@ 3722 +gantt_helper.rb +file + + + + +2010-11-19T13:04:46.900732Z +dfac5226f31c3c232d7dcc9416172071 +2010-10-23T09:08:55.877887Z +4283 +jplang + + + + + + + + + + + + + + + + + + + + + +1988 + mail_handler_helper.rb file @@ -774,6 +774,40 @@ 817 +journals_helper.rb +file + + + + +2010-09-24T12:48:25.903794Z +b64edde44bceed7fb0911f87dba971aa +2010-09-05T22:57:20.669640Z +4062 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +2266 + workflows_helper.rb file @@ -808,40 +842,6 @@ 824 -journals_helper.rb -file - - - - -2010-09-24T12:48:25.903794Z -b64edde44bceed7fb0911f87dba971aa -2010-09-05T22:57:20.669640Z -4062 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -2266 - reports_helper.rb file @@ -876,6 +876,74 @@ 1265 +timelog_helper.rb +file + + + + +2010-09-23T14:37:44.431779Z +1888fd2d4a1be5fa0d6ad8a63238e2b4 +2010-04-30T12:18:11.536180Z +3708 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +6636 + +settings_helper.rb +file + + + + +2010-11-19T13:04:46.900732Z +868d0dc19e332ae2c817321637a8e31f +2010-09-28T21:09:06.467392Z +4222 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +3858 + custom_fields_helper.rb file @@ -910,108 +978,6 @@ 5702 -settings_helper.rb -file - - - - -2010-11-19T13:04:46.900732Z -868d0dc19e332ae2c817321637a8e31f -2010-09-28T21:09:06.467392Z -4222 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -3858 - -timelog_helper.rb -file - - - - -2010-09-23T14:37:44.431779Z -1888fd2d4a1be5fa0d6ad8a63238e2b4 -2010-04-30T12:18:11.536180Z -3708 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -6636 - -issue_moves_helper.rb -file - - - - -2010-09-23T14:37:44.427784Z -66e99bd3af036c92a773a91e92a725f9 -2010-08-11T14:42:10.119704Z -3936 -edavis10 - - - - - - - - - - - - - - - - - - - - - -28 - users_helper.rb file @@ -1046,6 +1012,40 @@ 2767 +issue_moves_helper.rb +file + + + + +2010-09-23T14:37:44.427784Z +66e99bd3af036c92a773a91e92a725f9 +2010-08-11T14:42:10.119704Z +3936 +edavis10 + + + + + + + + + + + + + + + + + + + + + +28 + application_helper.rb file diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/all-wcprops --- a/app/models/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ K 25 svn:wc:ra_dav:version-url V 35 -/svn/!svn/ver/4704/trunk/app/models +/svn/!svn/ver/4730/trunk/app/models END document.rb K 25 @@ -19,13 +19,13 @@ K 25 svn:wc:ra_dav:version-url V 49 -/svn/!svn/ver/4703/trunk/app/models/repository.rb +/svn/!svn/ver/4712/trunk/app/models/repository.rb END time_entry.rb K 25 svn:wc:ra_dav:version-url V 49 -/svn/!svn/ver/4277/trunk/app/models/time_entry.rb +/svn/!svn/ver/4708/trunk/app/models/time_entry.rb END token.rb K 25 @@ -81,6 +81,12 @@ V 50 /svn/!svn/ver/3240/trunk/app/models/enumeration.rb END +issue.rb +K 25 +svn:wc:ra_dav:version-url +V 44 +/svn/!svn/ver/4723/trunk/app/models/issue.rb +END time_entry_activity_custom_field.rb K 25 svn:wc:ra_dav:version-url @@ -93,12 +99,6 @@ V 50 /svn/!svn/ver/3250/trunk/app/models/member_role.rb END -issue.rb -K 25 -svn:wc:ra_dav:version-url -V 44 -/svn/!svn/ver/4491/trunk/app/models/issue.rb -END issue_priority.rb K 25 svn:wc:ra_dav:version-url @@ -111,17 +111,23 @@ V 55 /svn/!svn/ver/3169/trunk/app/models/message_observer.rb END +wiki_content.rb +K 25 +svn:wc:ra_dav:version-url +V 51 +/svn/!svn/ver/4296/trunk/app/models/wiki_content.rb +END watcher.rb K 25 svn:wc:ra_dav:version-url V 46 /svn/!svn/ver/3167/trunk/app/models/watcher.rb END -wiki_content.rb +wiki_page.rb K 25 svn:wc:ra_dav:version-url -V 51 -/svn/!svn/ver/4296/trunk/app/models/wiki_content.rb +V 48 +/svn/!svn/ver/4296/trunk/app/models/wiki_page.rb END enabled_module.rb K 25 @@ -129,12 +135,6 @@ V 53 /svn/!svn/ver/2970/trunk/app/models/enabled_module.rb END -wiki_page.rb -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/4296/trunk/app/models/wiki_page.rb -END comment.rb K 25 svn:wc:ra_dav:version-url @@ -171,18 +171,18 @@ V 45 /svn/!svn/ver/4373/trunk/app/models/mailer.rb END +workflow.rb +K 25 +svn:wc:ra_dav:version-url +V 47 +/svn/!svn/ver/3709/trunk/app/models/workflow.rb +END journal.rb K 25 svn:wc:ra_dav:version-url V 46 /svn/!svn/ver/4062/trunk/app/models/journal.rb END -workflow.rb -K 25 -svn:wc:ra_dav:version-url -V 47 -/svn/!svn/ver/3709/trunk/app/models/workflow.rb -END user_custom_field.rb K 25 svn:wc:ra_dav:version-url @@ -211,7 +211,7 @@ K 25 svn:wc:ra_dav:version-url V 43 -/svn/!svn/ver/4599/trunk/app/models/user.rb +/svn/!svn/ver/4730/trunk/app/models/user.rb END auth_source.rb K 25 diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/entries --- a/app/models/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/models http://redmine.rubyforge.org/svn -2011-01-13T12:04:51.838288Z -4704 -tmaruyama +2011-01-16T15:36:42.998302Z +4730 +jplang @@ -103,10 +103,10 @@ -2011-01-13T14:09:10.000000Z -537f29e1342ca25d24692d4daaeb556a -2011-01-13T12:04:30.962313Z -4703 +2011-01-19T15:03:32.000000Z +ef582464c7d04e61c0149608ea3dd11c +2011-01-14T22:51:12.547821Z +4712 tmaruyama has-props @@ -129,7 +129,7 @@ -7040 +7023 time_entry.rb file @@ -137,10 +137,10 @@ -2010-11-19T13:04:46.956816Z -aa2cc7da3c19ce52813f08949e6cefec -2010-10-22T20:40:11.668687Z -4277 +2011-01-19T15:03:32.000000Z +db327d70b8e3bcf04992bf7c69522467 +2011-01-14T18:04:16.470040Z +4708 jplang has-props @@ -163,7 +163,7 @@ -4087 +4162 token.rb file @@ -471,6 +471,74 @@ 3856 +issue.rb +file + + + + +2011-01-19T15:03:32.000000Z +910893e1e82a08d072a65d7c7c3dc8a8 +2011-01-15T14:12:18.630628Z +4723 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +32309 + +member_role.rb +file + + + + +2010-09-23T14:37:44.475780Z +95caba31fc55fea2d5ff257e70cf14b2 +2009-12-26T16:14:55.591181Z +3250 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2011 + time_entry_activity_custom_field.rb file @@ -505,74 +573,6 @@ 896 -member_role.rb -file - - - - -2010-09-23T14:37:44.475780Z -95caba31fc55fea2d5ff257e70cf14b2 -2009-12-26T16:14:55.591181Z -3250 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -2011 - -issue.rb -file - - - - -2011-01-13T14:09:10.000000Z -20b0e57623f5e4f6c1856307a97652c1 -2010-12-12T13:11:53.259618Z -4491 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -32197 - issue_priority.rb file @@ -641,6 +641,40 @@ 979 +watcher.rb +file + + + + +2010-09-23T14:37:44.491776Z +c72443f206052fafae720378fba40163 +2009-12-13T12:39:22.716082Z +3167 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +2093 + wiki_content.rb file @@ -675,16 +709,16 @@ 4480 -watcher.rb +enabled_module.rb file -2010-09-23T14:37:44.491776Z -c72443f206052fafae720378fba40163 -2009-12-13T12:39:22.716082Z -3167 +2010-09-23T14:37:44.471831Z +56631baa5560f63cbb213855761c8fcc +2009-10-25T10:31:01.135799Z +2970 jplang has-props @@ -707,7 +741,7 @@ -2093 +1296 wiki_page.rb file @@ -743,40 +777,6 @@ 6720 -enabled_module.rb -file - - - - -2010-09-23T14:37:44.471831Z -56631baa5560f63cbb213855761c8fcc -2009-10-25T10:31:01.135799Z -2970 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -1296 - comment.rb file @@ -981,6 +981,40 @@ 18490 +journal.rb +file + + + + +2010-09-24T12:48:25.923798Z +f3797cd6a4b7e4d256aba15e317e98b1 +2010-09-05T22:57:20.669640Z +4062 +edavis10 +has-props + + + + + + + + + + + + + + + + + + + + +3214 + workflow.rb file @@ -1015,40 +1049,6 @@ 4028 -journal.rb -file - - - - -2010-09-24T12:48:25.923798Z -f3797cd6a4b7e4d256aba15e317e98b1 -2010-09-05T22:57:20.669640Z -4062 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -3214 - user_custom_field.rb file @@ -1191,10 +1191,10 @@ -2011-01-13T14:09:10.000000Z -06b12cdcbd1d36b8f0a04de3cef91ef4 -2010-12-31T15:30:50.544770Z -4599 +2011-01-19T15:03:32.000000Z +f1782d2190897c738b4abde29795c25c +2011-01-16T15:36:42.998302Z +4730 jplang has-props @@ -1217,7 +1217,7 @@ -15994 +17792 auth_source.rb file diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/text-base/issue.rb.svn-base --- a/app/models/.svn/text-base/issue.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/text-base/issue.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -456,11 +456,14 @@ (relations_from + relations_to).sort end - def all_dependent_issues + def all_dependent_issues(except=nil) + except ||= self dependencies = [] relations_from.each do |relation| - dependencies << relation.issue_to - dependencies += relation.issue_to.all_dependent_issues + if relation.issue_to && relation.issue_to != except + dependencies << relation.issue_to + dependencies += relation.issue_to.all_dependent_issues(except) + end end dependencies end diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/text-base/repository.rb.svn-base --- a/app/models/.svn/text-base/repository.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/text-base/repository.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -98,13 +98,13 @@ def relative_path(path) path end - + # Finds and returns a revision with a number or the beginning of a hash def find_changeset_by_name(name) - return nil if name.nil? || name.empty? + return nil if name.blank? changesets.find(:first, :conditions => (name.match(/^\d*$/) ? ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%'])) end - + def latest_changeset @latest_changeset ||= changesets.find(:first) end diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/text-base/time_entry.rb.svn-base --- a/app/models/.svn/text-base/time_entry.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/text-base/time_entry.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -66,6 +66,9 @@ # these attributes make time aggregations easier def spent_on=(date) super + if spent_on.is_a?(Time) + self.spent_on = spent_on.to_date + end self.tyear = spent_on ? spent_on.year : nil self.tmonth = spent_on ? spent_on.month : nil self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/.svn/text-base/user.rb.svn-base --- a/app/models/.svn/text-base/user.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/.svn/text-base/user.rb.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -48,8 +48,8 @@ has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify has_many :changesets, :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' - has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'" - has_one :api_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='api'" + has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'" + has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source # Active non-anonymous users scope @@ -74,6 +74,8 @@ validates_confirmation_of :password, :allow_nil => true validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true + before_destroy :remove_references_before_destroy + def before_create self.mail_notification = Setting.default_notification_option if self.mail_notification.blank? true @@ -260,12 +262,16 @@ notified_projects_ids end + def valid_notification_options + self.class.valid_notification_options(self) + end + # Only users that belong to more than 1 project can select projects for which they are notified - def valid_notification_options + def self.valid_notification_options(user=nil) # Note that @user.membership.size would fail since AR ignores # :include association option when doing a count - if memberships.length < 1 - MAIL_NOTIFICATION_OPTIONS.delete_if {|option| option.first == 'selected'} + if user.nil? || user.memberships.length < 1 + MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'} else MAIL_NOTIFICATION_OPTIONS end @@ -473,6 +479,31 @@ end private + + # Removes references that are not handled by associations + # Things that are not deleted are reassociated with the anonymous user + def remove_references_before_destroy + return if self.id.nil? + + substitute = User.anonymous + Attachment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Comment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Issue.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id] + Journal.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + JournalDetail.update_all ['old_value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s] + JournalDetail.update_all ['value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s] + Message.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + News.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + # Remove private queries and keep public ones + Query.delete_all ['user_id = ? AND is_public = ?', id, false] + Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + TimeEntry.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + Token.delete_all ['user_id = ?', id] + Watcher.delete_all ['user_id = ?', id] + WikiContent.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + WikiContent::Version.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + end # Return password digest def self.hash_password(clear_password) @@ -498,4 +529,9 @@ def mail; nil end def time_zone; nil end def rss_key; nil end + + # Anonymous user can not be destroyed + def destroy + false + end end diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/issue.rb --- a/app/models/issue.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/issue.rb Wed Jan 19 15:04:22 2011 +0000 @@ -456,11 +456,14 @@ (relations_from + relations_to).sort end - def all_dependent_issues + def all_dependent_issues(except=nil) + except ||= self dependencies = [] relations_from.each do |relation| - dependencies << relation.issue_to - dependencies += relation.issue_to.all_dependent_issues + if relation.issue_to && relation.issue_to != except + dependencies << relation.issue_to + dependencies += relation.issue_to.all_dependent_issues(except) + end end dependencies end diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/repository.rb --- a/app/models/repository.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/repository.rb Wed Jan 19 15:04:22 2011 +0000 @@ -98,13 +98,13 @@ def relative_path(path) path end - + # Finds and returns a revision with a number or the beginning of a hash def find_changeset_by_name(name) - return nil if name.nil? || name.empty? + return nil if name.blank? changesets.find(:first, :conditions => (name.match(/^\d*$/) ? ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%'])) end - + def latest_changeset @latest_changeset ||= changesets.find(:first) end diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/repository/.svn/entries --- a/app/models/repository/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/repository/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/models/repository http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/time_entry.rb --- a/app/models/time_entry.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/time_entry.rb Wed Jan 19 15:04:22 2011 +0000 @@ -66,6 +66,9 @@ # these attributes make time aggregations easier def spent_on=(date) super + if spent_on.is_a?(Time) + self.spent_on = spent_on.to_date + end self.tyear = spent_on ? spent_on.year : nil self.tmonth = spent_on ? spent_on.month : nil self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil diff -r 8661b858af72 -r 07fa8a8b56a8 app/models/user.rb --- a/app/models/user.rb Thu Jan 13 14:12:06 2011 +0000 +++ b/app/models/user.rb Wed Jan 19 15:04:22 2011 +0000 @@ -48,8 +48,8 @@ has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify has_many :changesets, :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' - has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'" - has_one :api_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='api'" + has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'" + has_one :api_token, :class_name => 'Token', :conditions => "action='api'" belongs_to :auth_source # Active non-anonymous users scope @@ -74,6 +74,8 @@ validates_confirmation_of :password, :allow_nil => true validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true + before_destroy :remove_references_before_destroy + def before_create self.mail_notification = Setting.default_notification_option if self.mail_notification.blank? true @@ -260,12 +262,16 @@ notified_projects_ids end + def valid_notification_options + self.class.valid_notification_options(self) + end + # Only users that belong to more than 1 project can select projects for which they are notified - def valid_notification_options + def self.valid_notification_options(user=nil) # Note that @user.membership.size would fail since AR ignores # :include association option when doing a count - if memberships.length < 1 - MAIL_NOTIFICATION_OPTIONS.delete_if {|option| option.first == 'selected'} + if user.nil? || user.memberships.length < 1 + MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'} else MAIL_NOTIFICATION_OPTIONS end @@ -473,6 +479,31 @@ end private + + # Removes references that are not handled by associations + # Things that are not deleted are reassociated with the anonymous user + def remove_references_before_destroy + return if self.id.nil? + + substitute = User.anonymous + Attachment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Comment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Issue.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id] + Journal.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + JournalDetail.update_all ['old_value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s] + JournalDetail.update_all ['value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s] + Message.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + News.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + # Remove private queries and keep public ones + Query.delete_all ['user_id = ? AND is_public = ?', id, false] + Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + TimeEntry.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + Token.delete_all ['user_id = ?', id] + Watcher.delete_all ['user_id = ?', id] + WikiContent.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + WikiContent::Version.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + end # Return password digest def self.hash_password(clear_password) @@ -498,4 +529,9 @@ def mail; nil end def time_zone; nil end def rss_key; nil end + + # Anonymous user can not be destroyed + def destroy + false + end end diff -r 8661b858af72 -r 07fa8a8b56a8 app/sweepers/.svn/entries --- a/app/sweepers/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/sweepers/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/sweepers http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/.svn/all-wcprops --- a/app/views/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,5 +1,5 @@ K 25 svn:wc:ra_dav:version-url V 34 -/svn/!svn/ver/4698/trunk/app/views +/svn/!svn/ver/4731/trunk/app/views END diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/.svn/entries --- a/app/views/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views http://redmine.rubyforge.org/svn -2011-01-11T16:04:07.541291Z -4698 -tmaruyama +2011-01-16T16:36:58.753919Z +4731 +jplang @@ -68,22 +68,22 @@ custom_fields dir -users +issue_moves dir -issue_moves +users dir files dir -ldap_auth_sources +previews dir auth_sources dir -previews +ldap_auth_sources dir search @@ -92,10 +92,10 @@ messages dir -issue_relations +versions dir -versions +issue_relations dir mailer diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/account/.svn/entries --- a/app/views/account/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/account/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/account http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/activities/.svn/entries --- a/app/views/activities/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/activities/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/activities http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/admin/.svn/entries --- a/app/views/admin/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/admin/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/admin http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/attachments/.svn/entries --- a/app/views/attachments/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/attachments/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/attachments http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/auth_sources/.svn/entries --- a/app/views/auth_sources/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/auth_sources/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/auth_sources http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/auto_completes/.svn/entries --- a/app/views/auto_completes/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/auto_completes/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/auto_completes http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/boards/.svn/entries --- a/app/views/boards/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/boards/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/boards http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/calendars/.svn/entries --- a/app/views/calendars/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/calendars/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/calendars http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/common/.svn/entries --- a/app/views/common/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/common/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/common http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/context_menus/.svn/entries --- a/app/views/context_menus/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/context_menus/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/context_menus http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/custom_fields/.svn/entries --- a/app/views/custom_fields/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/custom_fields/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/custom_fields http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/documents/.svn/entries --- a/app/views/documents/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/documents/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/documents http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/enumerations/.svn/entries --- a/app/views/enumerations/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/enumerations/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/enumerations http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/files/.svn/entries --- a/app/views/files/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/files/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/files http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/gantts/.svn/entries --- a/app/views/gantts/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/gantts/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/gantts http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/groups/.svn/entries --- a/app/views/groups/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/groups/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/groups http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/issue_categories/.svn/entries --- a/app/views/issue_categories/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/issue_categories/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/issue_categories http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/issue_moves/.svn/entries --- a/app/views/issue_moves/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/issue_moves/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/issue_moves http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/issue_relations/.svn/entries --- a/app/views/issue_relations/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/issue_relations/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/issue_relations http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/issue_statuses/.svn/entries --- a/app/views/issue_statuses/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/issue_statuses/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/issue_statuses http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/issues/.svn/entries --- a/app/views/issues/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/issues/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/issues http://redmine.rubyforge.org/svn @@ -60,40 +60,6 @@ 1816 -_action_menu.rhtml -file - - - - -2010-11-19T13:04:50.824922Z -74c6e939ebb113c49a367fff0f463f63 -2010-10-15T23:11:05.712143Z -4258 -edavis10 - - - - - - - - - - - - - - - - - - - - - -1285 - _history.rhtml file @@ -128,6 +94,74 @@ 859 +_action_menu.rhtml +file + + + + +2010-11-19T13:04:50.824922Z +74c6e939ebb113c49a367fff0f463f63 +2010-10-15T23:11:05.712143Z +4258 +edavis10 + + + + + + + + + + + + + + + + + + + + + +1285 + +bulk_edit.rhtml +file + + + + +2011-01-13T14:09:38.000000Z +f3bdc270087564333ffdacd38f1d363c +2010-12-18T14:14:04.023240Z +4533 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +3443 + _form.rhtml file @@ -162,40 +196,6 @@ 2033 -bulk_edit.rhtml -file - - - - -2011-01-13T14:09:38.000000Z -f3bdc270087564333ffdacd38f1d363c -2010-12-18T14:14:04.023240Z -4533 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -3443 - _form_update.rhtml file @@ -434,6 +434,40 @@ 353 +_list_simple.rhtml +file + + + + +2010-09-23T14:37:44.571741Z +334ec8cd87b661a181185092c242c41d +2010-08-08T07:07:20.961363Z +3924 +jbbarth +has-props + + + + + + + + + + + + + + + + + + + + +989 + _changesets.rhtml file @@ -468,40 +502,6 @@ 470 -_list_simple.rhtml -file - - - - -2010-09-23T14:37:44.571741Z -334ec8cd87b661a181185092c242c41d -2010-08-08T07:07:20.961363Z -3924 -jbbarth -has-props - - - - - - - - - - - - - - - - - - - - -989 - _edit.rhtml file diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/journals/.svn/entries --- a/app/views/journals/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/journals/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,7 +1,7 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/journals http://redmine.rubyforge.org/svn diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/layouts/.svn/all-wcprops --- a/app/views/layouts/.svn/all-wcprops Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/layouts/.svn/all-wcprops Wed Jan 19 15:04:22 2011 +0000 @@ -1,13 +1,13 @@ K 25 svn:wc:ra_dav:version-url V 42 -/svn/!svn/ver/4618/trunk/app/views/layouts +/svn/!svn/ver/4731/trunk/app/views/layouts END base.rhtml K 25 svn:wc:ra_dav:version-url V 53 -/svn/!svn/ver/4618/trunk/app/views/layouts/base.rhtml +/svn/!svn/ver/4731/trunk/app/views/layouts/base.rhtml END mailer.text.plain.erb K 25 diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/layouts/.svn/entries --- a/app/views/layouts/.svn/entries Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/layouts/.svn/entries Wed Jan 19 15:04:22 2011 +0000 @@ -1,14 +1,14 @@ 10 dir -4707 +4732 http://redmine.rubyforge.org/svn/trunk/app/views/layouts http://redmine.rubyforge.org/svn -2011-01-02T12:16:06.700181Z -4618 +2011-01-16T16:36:58.753919Z +4731 jplang @@ -32,10 +32,10 @@ -2011-01-13T14:09:10.000000Z -cd4a6bfaaaa0fed093ac8d467803aa0a -2011-01-02T12:16:06.700181Z -4618 +2011-01-19T15:03:32.000000Z +0bc162aa0af44b46e02548061da67700 +2011-01-16T16:36:58.753919Z +4731 jplang has-props @@ -58,7 +58,7 @@ -2925 +2927 mailer.text.plain.erb file diff -r 8661b858af72 -r 07fa8a8b56a8 app/views/layouts/.svn/text-base/base.rhtml.svn-base --- a/app/views/layouts/.svn/text-base/base.rhtml.svn-base Thu Jan 13 14:12:06 2011 +0000 +++ b/app/views/layouts/.svn/text-base/base.rhtml.svn-base Wed Jan 19 15:04:22 2011 +0000 @@ -11,7 +11,7 @@ <%= javascript_include_tag :defaults %> <%= heads_for_theme %> <%= heads_for_wiki_formatter %> -