From b42e6bdf82da7383a29f2a88ac7a79ff3542de3d Mon Sep 17 00:00:00 2001 From: ayumi_arai <0araiayumi@gmail.com> Date: Wed, 31 Jul 2019 11:10:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?gitignore=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AE=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/Insta_app.iml | 18 +- .idea/workspace.xml | 496 +++++++++--------- .rspec | 2 + Gemfile | 16 +- Gemfile.lock | 83 ++- app/controllers/sessions_controller.rb | 5 - app/mailers/confirmation_mailer.rb | 12 +- app/models/feed.rb | 2 + app/models/movie.rb | 3 + app/uploaders/image_uploader.rb | 4 +- .../confirmation_mail.html.erb | 6 +- bin/rspec | 8 + config/application.rb | 8 + config/initializers/carrierwave.rb | 27 + db/migrate/20190521054648_create_movies.rb | 12 + db/schema.rb | 11 +- ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-08_11.33.36.png" | Bin 0 -> 205241 bytes ...3\203\343\203\210_2019-05-13_11.45.33.png" | Bin 0 -> 35433 bytes ...3\203\343\203\210_2019-05-07_12.00.31.png" | Bin 0 -> 122000 bytes ...3\203\343\203\210_2019-05-07_12.00.31.png" | Bin 0 -> 122000 bytes spec/factories/movies.rb | 8 + spec/models/movie_spec.rb | 40 ++ spec/rails_helper.rb | 61 +++ spec/spec_helper.rb | 96 ++++ 33 files changed, 648 insertions(+), 270 deletions(-) create mode 100644 .rspec create mode 100644 app/models/movie.rb create mode 100755 bin/rspec create mode 100644 config/initializers/carrierwave.rb create mode 100644 db/migrate/20190521054648_create_movies.rb create mode 100644 "public/uploads/feed/image/14/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/15/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/16/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/17/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/18/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/19/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/20/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/21/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/22/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/23/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-08_11.33.36.png" create mode 100644 "public/uploads/feed/image/24/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-13_11.45.33.png" create mode 100644 "public/uploads/tmp/1557299329-59041-0001-8066/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-07_12.00.31.png" create mode 100644 "public/uploads/tmp/1557299428-59041-0002-1463/\343\202\271\343\202\257\343\203\252\343\203\274\343\203\263\343\202\267\343\203\247\343\203\203\343\203\210_2019-05-07_12.00.31.png" create mode 100644 spec/factories/movies.rb create mode 100644 spec/models/movie_spec.rb create mode 100644 spec/rails_helper.rb create mode 100644 spec/spec_helper.rb diff --git a/.idea/Insta_app.iml b/.idea/Insta_app.iml index 8fd7828..cf8712b 100644 --- a/.idea/Insta_app.iml +++ b/.idea/Insta_app.iml @@ -39,23 +39,28 @@ - + + + + + + @@ -96,11 +101,19 @@ + + + + + + + + @@ -111,9 +124,10 @@ - + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c1cf550..268ce16 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,10 +2,30 @@ + + + + + + + + + + + + + + - + + + + + + + - + @@ -22,69 +42,83 @@ - + - - + + - + - - + + - - - - - - + - - + + - + - - + + - + - - + + - + + + + + + - - + + - + - + + + + + + + + + + + + + + + @@ -97,7 +131,6 @@ @@ -155,9 +193,9 @@ - @@ -166,7 +204,6 @@ - @@ -174,50 +211,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -227,22 +220,19 @@ - - - - - - +