diff --git a/.idea/guoren.iml b/.idea/guoren.iml index a7856d0..bd07381 100644 --- a/.idea/guoren.iml +++ b/.idea/guoren.iml @@ -131,7 +131,6 @@ - diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 56a7abb..0e00fc9 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,12 @@ + + + + @@ -21,7 +25,7 @@ - + @@ -32,101 +36,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -158,10 +72,10 @@ - + @@ -242,6 +156,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -304,6 +240,24 @@ + + + + + + + + + + + + + + + + + + @@ -519,25 +473,25 @@ - + - + - + - + - + @@ -566,13 +520,6 @@ - - - file://$PROJECT_DIR$/app/controllers/micro_posts_controller.rb - 21 - - - @@ -586,29 +533,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -628,6 +552,7 @@ + @@ -709,13 +634,6 @@ - - - - - - - @@ -758,13 +676,6 @@ - - - - - - - @@ -792,14 +703,6 @@ - - - - - - - - @@ -811,6 +714,7 @@ + @@ -903,14 +807,6 @@ - - - - - - - - @@ -935,10 +831,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + diff --git a/Gemfile b/Gemfile index 79f2914..d6ad9fb 100644 --- a/Gemfile +++ b/Gemfile @@ -25,8 +25,6 @@ gem 'jbuilder', '~> 2.5' # gem 'redis', '~> 3.0' # Use ActiveModel has_secure_password gem 'bcrypt', '~> 3.1.7' -# for windows -gem 'bcrypt-ruby', '~> 3.0.0', :require => "bcrypt" # will_paginate gem 'will_paginate', '~> 3.1.0' diff --git a/Gemfile.lock b/Gemfile.lock index d5f7370..eb295f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,7 +41,6 @@ GEM arel (7.1.4) bcrypt (3.1.11) bcrypt (3.1.11-x64-mingw32) - bcrypt-ruby (3.0.1) builder (3.2.2) byebug (9.0.6) coffee-rails (4.2.1) @@ -168,7 +167,6 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) - bcrypt-ruby (~> 3.0.0) byebug coffee-rails (~> 4.2) jbuilder (~> 2.5) diff --git a/app/views/main/main.html.erb b/app/views/main/main.html.erb index ac0e728..49131fd 100644 --- a/app/views/main/main.html.erb +++ b/app/views/main/main.html.erb @@ -5,7 +5,7 @@ <%= render 'layouts/nav' %> - + <% @micro_posts_array.each do |micro_post| %> diff --git a/db/development.sqlite3 b/db/development.sqlite3 index fcbad81..437f6dd 100644 Binary files a/db/development.sqlite3 and b/db/development.sqlite3 differ