Skip to content

Commit

Permalink
Merge pull request #163 from comorebi-notes/develop
Browse files Browse the repository at this point in the history
各種ライブラリをバージョンアップ
  • Loading branch information
comorebi-notes authored May 13, 2023
2 parents a8c9a23 + 48259de commit aa74f77
Show file tree
Hide file tree
Showing 91 changed files with 8,401 additions and 5,254 deletions.
39 changes: 0 additions & 39 deletions .babelrc

This file was deleted.

1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ tags

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.6.0
16.19.1
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.5
3.2.1
43 changes: 23 additions & 20 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

ruby '2.6.5'
ruby '3.2.1'

# Core
gem 'rails', '~> 5.2.2.1'
gem 'pg', '>= 0.18', '< 2.0'
gem 'puma', '~> 3.11'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'webpacker', '~> 3.5.5'
gem 'therubyracer', platforms: :ruby
gem 'jbuilder', '~> 2.5'
gem 'rails', '6.1.7.3'
gem 'pg'
gem 'puma'
gem 'sassc-rails'
gem 'terser'
gem 'webpacker'
# gem 'mini_racer'
gem 'jbuilder'
# gem 'capistrano-rails', group: :development
gem 'bootsnap', '>= 1.1.0', require: false
gem 'bootsnap'
gem 'unicorn'
gem 'dotenv-rails'

# Layout
gem 'font-awesome-rails'
gem 'rails-i18n'
gem 'slim-rails'
gem 'bulma-rails'
gem 'bulma-rails', '0.7.4'

# API
gem 'friendly_id'
Expand All @@ -34,30 +34,31 @@ gem 'kaminari'

# Authentication
gem 'devise'
gem 'omniauth'
gem 'omniauth-twitter'
gem 'omniauth-facebook'
gem 'omniauth-google-oauth2'
gem 'omniauth-tumblr'
gem 'omniauth-github'
gem 'omniauth', '~> 1.9.0'
gem 'omniauth-twitter', '~> 1.4.0'
gem 'omniauth-facebook', '~> 6.0.0'
gem 'omniauth-google-oauth2', '~> 0.6.0'
gem 'omniauth-tumblr', '~> 1.2'
gem 'omniauth-github', '~> 1.3.0'

# Management
gem 'cancancan'
gem 'rails_admin', github: 'sferik/rails_admin', ref: '0939adf49c708fccf730023ac8cf0fdff34f9917'
gem 'rails_admin'
gem 'rails_admin-i18n'
gem 'newrelic_rpm'

# Upload
gem 'carrierwave'
gem 'fog'
gem 'fog-openstack'
gem 'mime-types'
gem 'rmagick'

# Counter
gem 'impressionist'
gem 'counter_culture', '~> 1.8'

# Session
gem 'redis'
gem 'redis', '~>4.8.1'
gem 'redis-rails'

# Backup
Expand All @@ -68,6 +69,8 @@ gem 'whenever', require: false
gem 'exception_notification'
gem 'slack-notifier'

gem 'psych', '~> 3.1'

group :development, :test do
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'capybara', '~> 2.13'
Expand Down
Loading

0 comments on commit aa74f77

Please sign in to comment.