From 3fe03812e929f2d22513c276120205a65caddfa1 Mon Sep 17 00:00:00 2001 From: lovelyzhang Date: Mon, 26 Dec 2016 11:00:51 +0800 Subject: [PATCH] zy: change utc time --- .gitignore | 4 + .idea/workspace.xml | 315 ++- app/controllers/application_controller.rb | 4 +- app/controllers/comments_controller.rb | 4 +- app/controllers/micro_posts_controller.rb | 18 +- app/controllers/users_controller.rb | 1 + app/helpers/application_helper.rb | 5 + app/helpers/chat_helper.rb | 15 +- app/helpers/main_helper.rb | 2 +- app/helpers/micro_posts_helper.rb | 3 +- app/helpers/users_helper.rb | 8 +- app/views/micro_posts/show.html.erb | 1 + db/development.sqlite3 | Bin 53248 -> 53248 bytes log/development.log | 2444 +++++++++++++++++++++ 14 files changed, 2678 insertions(+), 146 deletions(-) diff --git a/.gitignore b/.gitignore index 4d1fbc2..f3f7020 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# Ruby的忽略文件 *.gem *.rbc /.config @@ -49,8 +50,11 @@ build-iPhoneSimulator/ # unless supporting rvm < 1.11.0 or doing something fancy, ignore this: .rvmrc +# JetBrain的忽略文件 .idea/* +# rails的忽略文件 + *.rbc capybara-*.html .rspec diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 64f4449..22fed67 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,18 @@ + + + + + + + + + + @@ -23,7 +33,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - + @@ -98,14 +64,22 @@ @@ -224,6 +198,50 @@