resolve conflict

Signed-off-by: alan <547533434@qq.com>
This commit is contained in:
alan 2015-01-10 11:05:24 +08:00
parent 575b641e25
commit 2b3aad2474
2 changed files with 107 additions and 18 deletions

View File

@ -1,18 +0,0 @@
*.swp
/.project
/.idea
/.bundle
*.swp
/config/database.yml
/files/*
/log/*
/tmp/*
.gitignore
/public/images/avatars/*
/Gemfile
/Gemfile.lock
/db/schema.rb
/Gemfile.lock
/lib/plugins/acts_as_versioned/test/debug.log
/config/configuration.yml
.rbenv-gemsets

View File

@ -104768,3 +104768,110 @@ ActionController::RoutingError (No route matches [GET] "/images/avatars/WebFoote
2015-01-10 10:59:19 INFO -- Rendered c:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/actionpack-3.2.13/lib/action_dispatch/middleware/templates/rescues/routing_error.erb within rescues/layout (0.0ms)
2015-01-10 10:59:19 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 10:59:19 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:42 INFO --
2015-01-10 11:01:42 INFO --
2015-01-10 11:01:42 INFO -- Started GET "/contests/12/contestnotifications" for 127.0.0.1 at 2015-01-10 11:01:42 +0800
2015-01-10 11:01:42 INFO -- Processing by ContestnotificationsController#index as HTML
2015-01-10 11:01:42 INFO -- Parameters: {"contest_id"=>"12"}
2015-01-10 11:01:42 DEBUG -- FirstPage Load (0.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:42 DEBUG -- WebFooterOranizer Load (0.0ms) SELECT `web_footer_oranizers`.* FROM `web_footer_oranizers` LIMIT 1
2015-01-10 11:01:42 DEBUG -- WebFooterCompany Load (0.0ms) SELECT `web_footer_companies`.* FROM `web_footer_companies` 
2015-01-10 11:01:42 DEBUG --  (0.0ms) SELECT MAX(`settings`.`updated_on`) AS max_id FROM `settings`
2015-01-10 11:01:42 DEBUG -- AnonymousUser Load (1.0ms) SELECT `users`.* FROM `users` WHERE `users`.`type` IN ('AnonymousUser') LIMIT 1
2015-01-10 11:01:42 INFO -- HTTP_USER_AGENT Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36
2015-01-10 11:01:42 DEBUG -- Contest Load (0.0ms) SELECT `contests`.* FROM `contests` WHERE `contests`.`id` = 12 LIMIT 1
2015-01-10 11:01:42 DEBUG -- User Load (0.0ms) SELECT `users`.* FROM `users` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `users`.`id` = 197 LIMIT 1
2015-01-10 11:01:42 DEBUG --  (0.0ms) SELECT COUNT(*) FROM `contestnotifications` WHERE `contestnotifications`.`contest_id` = 12
2015-01-10 11:01:42 DEBUG -- Contestnotification Load (0.0ms) SELECT `contestnotifications`.* FROM `contestnotifications` WHERE `contestnotifications`.`contest_id` = 12 ORDER BY contestnotifications.created_at DESC LIMIT 10 OFFSET 0
2015-01-10 11:01:42 INFO -- Rendered contestnotifications/_form.html.erb (1.0ms)
2015-01-10 11:01:42 INFO -- Rendered praise_tread/_praise_tread.html.erb (0.0ms)
2015-01-10 11:01:42 DEBUG -- CACHE (0.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:42 INFO -- Rendered contestnotifications/index.html.erb within layouts/base_newcontest (8.0ms)
2015-01-10 11:01:42 DEBUG -- CACHE (0.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:42 INFO -- Rendered plugins/redmine_code_review/app/views/code_review/_html_header.html.erb (0.0ms)
2015-01-10 11:01:43 DEBUG --  (5.0ms) SELECT COUNT(*) FROM `journals_for_messages` WHERE `journals_for_messages`.`jour_id` = 2 AND `journals_for_messages`.`jour_type` = 'Principal' AND (status=1)
2015-01-10 11:01:43 INFO -- Rendered layouts/_base_header.html.erb (9.0ms)
2015-01-10 11:01:43 DEBUG --  (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:43 DEBUG --  (0.0ms) SELECT COUNT(*) FROM `contesting_softapplications` WHERE `contesting_softapplications`.`contest_id` = 12
2015-01-10 11:01:43 DEBUG -- CACHE (0.0ms) SELECT `contests`.* FROM `contests` WHERE `contests`.`id` = 12 LIMIT 1
2015-01-10 11:01:43 DEBUG -- ActsAsTaggableOn::Tag Load (1.0ms) SELECT `tags`.* FROM `tags` INNER JOIN `taggings` ON `tags`.`id` = `taggings`.`tag_id` WHERE `taggings`.`taggable_id` = 12 AND `taggings`.`taggable_type` = 'Contest' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
2015-01-10 11:01:43 INFO -- Rendered tags/_tag_name.html.erb (3.0ms)
2015-01-10 11:01:43 INFO -- Rendered tags/_tag.html.erb (7.0ms)
2015-01-10 11:01:43 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:43 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:43 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:43 DEBUG -- User Load (0.0ms) SELECT `users`.* FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:43 INFO -- Rendered layouts/_base_footer.html.erb (1.0ms)
2015-01-10 11:01:43 INFO -- Rendered plugins/redmine_code_review/app/views/code_review/_body_bottom.html.erb (0.0ms)
2015-01-10 11:01:43 INFO -- Completed 200 OK in 106ms (Views: 48.0ms | ActiveRecord: 7.0ms)
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:43 INFO --
2015-01-10 11:01:43 INFO --
2015-01-10 11:01:43 INFO -- Started GET "/images/avatars/WebFooterCompany/0" for 127.0.0.1 at 2015-01-10 11:01:43 +0800
2015-01-10 11:01:43 FATAL --
ActionController::RoutingError (No route matches [GET] "/images/avatars/WebFooterCompany/0"):
lib/rack-mini-profiler/lib/mini_profiler/profiler.rb:300:in `call'
2015-01-10 11:01:43 INFO -- Rendered c:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/actionpack-3.2.13/lib/action_dispatch/middleware/templates/rescues/routing_error.erb within rescues/layout (1.0ms)
2015-01-10 11:01:43 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:48 INFO --
2015-01-10 11:01:48 INFO --
2015-01-10 11:01:48 INFO -- Started GET "/contests/12/contestnotifications" for 127.0.0.1 at 2015-01-10 11:01:48 +0800
2015-01-10 11:01:48 INFO -- Processing by ContestnotificationsController#index as HTML
2015-01-10 11:01:48 INFO -- Parameters: {"contest_id"=>"12"}
2015-01-10 11:01:48 DEBUG -- FirstPage Load (1.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:48 DEBUG -- WebFooterOranizer Load (0.0ms) SELECT `web_footer_oranizers`.* FROM `web_footer_oranizers` LIMIT 1
2015-01-10 11:01:48 DEBUG -- WebFooterCompany Load (0.0ms) SELECT `web_footer_companies`.* FROM `web_footer_companies` 
2015-01-10 11:01:48 DEBUG --  (0.0ms) SELECT MAX(`settings`.`updated_on`) AS max_id FROM `settings`
2015-01-10 11:01:48 DEBUG -- AnonymousUser Load (1.0ms) SELECT `users`.* FROM `users` WHERE `users`.`type` IN ('AnonymousUser') LIMIT 1
2015-01-10 11:01:48 INFO -- HTTP_USER_AGENT Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36
2015-01-10 11:01:48 DEBUG -- Contest Load (0.0ms) SELECT `contests`.* FROM `contests` WHERE `contests`.`id` = 12 LIMIT 1
2015-01-10 11:01:48 DEBUG -- User Load (1.0ms) SELECT `users`.* FROM `users` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `users`.`id` = 197 LIMIT 1
2015-01-10 11:01:48 DEBUG --  (1.0ms) SELECT COUNT(*) FROM `contestnotifications` WHERE `contestnotifications`.`contest_id` = 12
2015-01-10 11:01:48 DEBUG -- Contestnotification Load (0.0ms) SELECT `contestnotifications`.* FROM `contestnotifications` WHERE `contestnotifications`.`contest_id` = 12 ORDER BY contestnotifications.created_at DESC LIMIT 10 OFFSET 0
2015-01-10 11:01:48 INFO -- Rendered contestnotifications/_form.html.erb (2.0ms)
2015-01-10 11:01:48 INFO -- Rendered praise_tread/_praise_tread.html.erb (0.0ms)
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:48 INFO -- Rendered contestnotifications/index.html.erb within layouts/base_newcontest (8.0ms)
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT `first_pages`.* FROM `first_pages` WHERE `first_pages`.`page_type` = 'project' LIMIT 1
2015-01-10 11:01:48 INFO -- Rendered plugins/redmine_code_review/app/views/code_review/_html_header.html.erb (0.0ms)
2015-01-10 11:01:48 DEBUG --  (4.0ms) SELECT COUNT(*) FROM `journals_for_messages` WHERE `journals_for_messages`.`jour_id` = 2 AND `journals_for_messages`.`jour_type` = 'Principal' AND (status=1)
2015-01-10 11:01:48 INFO -- Rendered layouts/_base_header.html.erb (9.0ms)
2015-01-10 11:01:48 DEBUG --  (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:48 DEBUG --  (0.0ms) SELECT COUNT(*) FROM `contesting_softapplications` WHERE `contesting_softapplications`.`contest_id` = 12
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT `contests`.* FROM `contests` WHERE `contests`.`id` = 12 LIMIT 1
2015-01-10 11:01:48 DEBUG -- ActsAsTaggableOn::Tag Load (0.0ms) SELECT `tags`.* FROM `tags` INNER JOIN `taggings` ON `tags`.`id` = `taggings`.`tag_id` WHERE `taggings`.`taggable_id` = 12 AND `taggings`.`taggable_type` = 'Contest' AND (taggings.context = 'tags' AND taggings.tagger_id IS NULL)
2015-01-10 11:01:48 INFO -- Rendered tags/_tag_name.html.erb (4.0ms)
2015-01-10 11:01:48 INFO -- Rendered tags/_tag.html.erb (7.0ms)
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:48 DEBUG -- CACHE (0.0ms) SELECT COUNT(*) FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:48 DEBUG -- User Load (1.0ms) SELECT `users`.* FROM `users` INNER JOIN `watchers` ON `users`.`id` = `watchers`.`user_id` WHERE `users`.`type` IN ('User', 'AnonymousUser') AND `watchers`.`watchable_id` = 12 AND `watchers`.`watchable_type` = 'Contest'
2015-01-10 11:01:48 INFO -- Rendered layouts/_base_footer.html.erb (1.0ms)
2015-01-10 11:01:48 INFO -- Rendered plugins/redmine_code_review/app/views/code_review/_body_bottom.html.erb (0.0ms)
2015-01-10 11:01:48 INFO -- Completed 200 OK in 67ms (Views: 49.0ms | ActiveRecord: 9.0ms)
2015-01-10 11:01:48 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1
2015-01-10 11:01:48 INFO --
2015-01-10 11:01:48 INFO --
2015-01-10 11:01:48 INFO -- Started GET "/images/avatars/WebFooterCompany/0" for 127.0.0.1 at 2015-01-10 11:01:48 +0800
2015-01-10 11:01:48 FATAL --
ActionController::RoutingError (No route matches [GET] "/images/avatars/WebFooterCompany/0"):
lib/rack-mini-profiler/lib/mini_profiler/profiler.rb:300:in `call'
2015-01-10 11:01:48 INFO -- Rendered c:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/actionpack-3.2.13/lib/action_dispatch/middleware/templates/rescues/routing_error.erb within rescues/layout (0.0ms)
2015-01-10 11:01:48 WARN -- MiniProfiler storage failure: No such file or directory - e:/trustie/tmp/miniprofiler/mp_views_127.0.0.1