Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
3f693b8
Merge pull request #30 from kudojp/resolve-version-conflicts
kudojp Aug 29, 2020
64d6ba3
Bump http-proxy from 1.18.0 to 1.18.1
dependabot[bot] Sep 11, 2020
26b4e39
Merge pull request #31 from kudojp/dependabot/npm_and_yarn/http-proxy…
kudojp Sep 11, 2020
33a09cb
Create SECURITY.md
kudojp Nov 6, 2020
2ec1b28
Enable binding.pry in dev & test environments
kudojp Nov 27, 2020
f80579d
Add wording 合計xkcal
kudojp Nov 27, 2020
11426e7
Yarn upgrade
kudojp Nov 27, 2020
9e012f4
Modify judgement of @is_own_meal_post
kudojp Nov 27, 2020
ebce4cd
Show details of meal_post
kudojp Nov 27, 2020
bbd5831
Merge pull request #32 from kudojp/show-detail-of-posts
kudojp Nov 27, 2020
4745d29
Bump listen from 3.1.5 to 3.4.1
dependabot-preview[bot] Mar 6, 2021
0af7cf4
Bump pry-stack_explorer from 0.5.1 to 0.6.1
dependabot-preview[bot] Mar 6, 2021
55ad8fd
[Security] Bump nokogiri from 1.10.10 to 1.11.1
dependabot-preview[bot] Mar 6, 2021
ca2537c
Merge pull request #33 from kudojp/dependabot/bundler/listen-3.4.1
kudojp Mar 6, 2021
f702c63
Merge pull request #35 from kudojp/dependabot/bundler/pry-stack_explo…
kudojp Mar 6, 2021
a165e66
Merge pull request #37 from kudojp/dependabot/bundler/nokogiri-1.11.1
kudojp Mar 6, 2021
38f67b4
Bump omniauth-facebook from 7.0.0 to 8.0.0
dependabot-preview[bot] Mar 6, 2021
ffcbf49
Bump webpacker from 4.3.0 to 5.2.1
dependabot-preview[bot] Mar 6, 2021
0cab502
Bump devise from 4.7.2 to 4.7.3
dependabot-preview[bot] Mar 6, 2021
3612789
Merge pull request #34 from kudojp/dependabot/bundler/devise-4.7.3
kudojp Mar 6, 2021
31587d2
Merge pull request #36 from kudojp/dependabot/bundler/webpacker-5.2.1
kudojp Mar 6, 2021
fcbef25
Merge pull request #38 from kudojp/dependabot/bundler/omniauth-facebo…
kudojp Mar 6, 2021
9e69a12
Bump cocoon from 1.2.14 to 1.2.15
dependabot-preview[bot] Mar 8, 2021
02b5ce8
Bump web-console from 4.0.4 to 4.1.0
dependabot-preview[bot] Mar 8, 2021
e5db83e
Bump capybara from 3.33.0 to 3.35.3
dependabot-preview[bot] Mar 8, 2021
413c04b
Bump webdrivers from 4.4.1 to 4.6.0
dependabot-preview[bot] Mar 9, 2021
70d86f0
Bump elliptic from 6.5.3 to 6.5.4
dependabot[bot] Mar 10, 2021
de6a5c9
Bump faker from 2.13.0 to 2.17.0
dependabot-preview[bot] Mar 12, 2021
73d2eef
Bump counter_culture from 2.6.0 to 2.8.0
dependabot-preview[bot] Mar 17, 2021
2bea850
Bump rspec-rails from 4.0.1 to 5.0.1
dependabot-preview[bot] Mar 18, 2021
27df9c2
Merge pull request #54 from kudojp/dependabot/bundler/rspec-rails-5.0.1
kudojp Mar 21, 2021
cbd2c3b
Bump rails from 6.0.3.2 to 6.1.3
dependabot-preview[bot] Mar 21, 2021
a92bf01
Merge pull request #53 from kudojp/dependabot/bundler/counter_culture…
kudojp Mar 21, 2021
6580f55
Merge pull request #51 from kudojp/dependabot/npm_and_yarn/elliptic-6…
kudojp Mar 21, 2021
bf1b786
Merge pull request #48 from kudojp/dependabot/bundler/rails-6.1.3
kudojp Mar 21, 2021
9340444
Merge pull request #46 from kudojp/dependabot/bundler/webdrivers-4.6.0
kudojp Mar 21, 2021
354e613
Merge pull request #45 from kudojp/dependabot/bundler/capybara-3.35.3
kudojp Mar 21, 2021
f1fd857
Merge pull request #43 from kudojp/dependabot/bundler/cocoon-1.2.15
kudojp Mar 21, 2021
8023451
Merge pull request #52 from kudojp/dependabot/bundler/faker-2.17.0
kudojp Mar 21, 2021
cfc5ad2
Merge pull request #44 from kudojp/dependabot/bundler/web-console-4.1.0
kudojp Mar 21, 2021
fcdf479
Bump puma from 4.3.5 to 5.2.2
dependabot-preview[bot] Mar 21, 2021
744c4e5
Bump bootsnap from 1.4.8 to 1.7.3
dependabot-preview[bot] Mar 22, 2021
ead0a3c
Bump listen from 3.4.1 to 3.5.0
dependabot-preview[bot] Mar 23, 2021
65ec073
Bump rails from 6.1.3 to 6.1.3.1
dependabot-preview[bot] Mar 26, 2021
343bbb9
Merge pull request #59 from kudojp/dependabot/bundler/rails-6.1.3.1
kudojp Mar 27, 2021
853a30b
Merge pull request #57 from kudojp/dependabot/bundler/listen-3.5.0
kudojp Mar 27, 2021
9657590
Merge pull request #56 from kudojp/dependabot/bundler/bootsnap-1.7.3
kudojp Mar 27, 2021
9721622
Merge pull request #49 from kudojp/dependabot/bundler/puma-5.2.2
kudojp Mar 27, 2021
adaa543
Bump ssri from 6.0.1 to 6.0.2
dependabot[bot] Apr 19, 2021
6d29e46
Merge pull request #63 from kudojp/dependabot/npm_and_yarn/ssri-6.0.2
kudojp Apr 26, 2021
3aadfc2
Bump devise from 4.7.3 to 4.8.0
dependabot-preview[bot] Apr 29, 2021
759e62f
Make japanese readme foldabale
kudojp May 1, 2021
c14828e
Merge branch 'master' of github.com:kudojp/diet-app
kudojp May 1, 2021
b2b597a
Merge pull request #69 from kudojp/dependabot/bundler/devise-4.8.0
kudojp May 4, 2021
73de36c
Update README.md
kudojp May 16, 2021
a36f87f
Add japanese translation
kudojp May 17, 2021
c6c22bd
Update README.md
kudojp May 25, 2021
1282d72
Bump postcss from 7.0.27 to 7.0.36
dependabot[bot] Jun 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '2.7.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
gem 'rails', '~> 6.1.3'
# Use sqlite3 as the database for Active Record
# gem 'sqlite3', '~> 1.4'
gem 'pg'
# Use Puma as the app server
gem 'puma', '~> 4.3'
gem 'puma', '~> 5.2'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
gem 'webpacker', '~> 5.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
# gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
Expand Down Expand Up @@ -46,12 +46,16 @@ group :development, :test do
gem 'rspec-rails'
gem 'factory_bot_rails'
gem 'faker'
gem 'pry-rails'
gem 'pry-doc'
gem 'pry-byebug'
gem 'pry-stack_explorer'
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.6'
# 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'
Expand Down
Loading