Merge develop to master (#118)

* refactor: Modify alert style (#69) LGTM * addfunc: Modify image uploader (#71) LGTM * refactor:modify_devise_mail_message/#63 (#73) LGTM * Modify typographical error body email changed #74 * refactor: Modify sign up form #70 (#76) LGTM * addfunc: Add share button #55 (#77) LGTM * Addfunc/modify to ajax/#54 (#79) * addfunc: Split JavaScript files #54 * addfunc: Add function Ajax process to like #54 * addfunc: Add function Ajax process to follow #54 * addfunc: Fix like #54 * addfunc: Fix follow #54 * addfunc: Add function Ajax process to commnent #54 * refactor: Like #54 LGTM * fix: Modify image uploader #72 (#80) LGTM * addfunc: Add functions private post #53 (#84) LGTM * refactor: Refactor gem update nokogiri (#92) LGTM * refactor: Modify lodash (#93) LGTM * refactor: Update websocket-extensions (#94) LGTM * refactor: Update rack (#95) LGTM * refactor: Update puma (#96) LGTM * Bump puma from 4.3.5 to 5.0.4 (#97) Bumps [puma](https://github.com/puma/puma) from 4.3.5 to 5.0.4. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v4.3.5...v5.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump rails from 6.0.2.1 to 6.0.3.4 (#98) Bumps [rails](https://github.com/rails/rails) from 6.0.2.1 to 6.0.3.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](rails/rails@v6.0.2.1...v6.0.3.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump dotenv-rails from 2.7.5 to 2.7.6 (#99) Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.7.5 to 2.7.6. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](bkeepers/dotenv@v2.7.5...v2.7.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump bootsnap from 1.4.5 to 1.5.1 (#101) Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.5 to 1.5.1. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](Shopify/bootsnap@v1.4.5...v1.5.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Bump listen from 3.1.5 to 3.3.1 (#100) Bumps [listen](https://github.com/guard/listen) from 3.1.5 to 3.3.1. - [Release notes](https://github.com/guard/listen/releases) - [Commits](guard/listen@v3.1.5...v3.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * refactor: Update package and yarn * fix: Remove local SSL setting #102 (#105) LGTM * fix: Refactor redirect HOME page after sing-in #103 (#106) LGTM * Create pull_request_template.md * Refactor/improve template UI (#117) * fix: package & yarn * fix: Font Awsome * fix: Ajax process * refactor: Remove reading related Facebook button * refactor: template #104 * refactor: /posts * refactor: /posts/show * refactor: /users * refactor: /posts/ranking * refactor: /psots/search * refactor: /posts when it signout * refactoring Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
jungissei · Dec 9, 2020 · 4dbd5d0 · 4dbd5d0
1 parent 63f5716
commit 4dbd5d0
Show file tree

Hide file tree

Showing 87 changed files with 4,104 additions and 2,246 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,13 @@
+close #
+
+## 概要
+
+- 例）トップページのメッセージ概要
+
+## 修正内容の検証方法
+
+- 例）アプリケーションを`rails s`コマンドを実行して、`localhost`にアクセス
+
+## この修正が正しい理由
+
+- 例）ローカル環境で正常に表示されることを確認済み
diff --git a/Gemfile b/Gemfile
@@ -4,11 +4,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '2.6.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
+gem 'rails', '~> 6.0.3'
 # Use mysql as the database for Active Record
 gem 'mysql2', '>= 0.4.4'
 # Use Puma as the app server
-gem 'puma', '~> 4.1'
+gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
@@ -36,7 +36,7 @@ end
 group :development do
   # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
   gem 'web-console', '>= 3.3.0'
-  gem 'listen', '>= 3.0.5', '< 3.2'
+  gem 'listen', '>= 3.0.5', '< 3.4'
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
@@ -61,8 +61,10 @@ gem 'devise-i18n'
 gem 'devise-i18n-views'
 
 gem 'carrierwave'
-gem 'fog'
+gem 'fog-aws'
 
 gem 'kaminari'
 
-gem 'rack-attack'
+gem 'rack-attack'
+
+gem 'ransack'