Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2020121802 upgrade rails 4 5 6 #1781

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

2020121802 upgrade rails 4 5 6 #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f4baa50
working on improving report builder query
kirykr Dec 9, 2020
db55525
updated report builder raw sql
kirykr Dec 10, 2020
6f41ad9
update rails 4 to 5
kirykr Dec 10, 2020
16c128b
ran rails app:update
kirykr Dec 11, 2020
4828dc5
moving rails 4 to 5
kirykr Dec 14, 2020
c96ec78
working on improving select2 after updating the select2 gem
kirykr Dec 14, 2020
914a05c
finished refactoring select2 find client in dashboard
kirykr Dec 15, 2020
fb0d673
update select dropdown template
kirykr Dec 15, 2020
792c78a
update config/webpacker.yml resolve_path
kirykr Dec 15, 2020
ab1377d
fixed service type select
kirykr Dec 16, 2020
17f8ea5
fixed duplicated table in the schema
kirykr Dec 18, 2020
64ba56f
clearn up schema with fresh new database
kirykr Dec 18, 2020
ba49e3a
merged with 2020121002
kirykr Dec 18, 2020
2bfc780
worked on fixing migration duplicates
kirykr Dec 21, 2020
b987bf0
fixed thredded BaseMigration
kirykr Dec 21, 2020
7fef075
fixed ActiveModel::ArraySerializer constant error
kirykr Dec 21, 2020
aeb7712
fixed select2 report builder and select2 dropdown
kirykr Dec 23, 2020
0b7b093
fixed parameter merge in client_helper
kirykr Dec 23, 2020
1a024ad
fixed client new client uniq contrain error
kirykr Dec 24, 2020
b852fa3
fixed error in app/helpers/clients_helper.rb
kirykr Dec 24, 2020
e280cd7
fixed referral save error
kirykr Dec 24, 2020
598fd5d
reran migration
kirykr Dec 25, 2020
d005001
fixed report builder dropdown width
kirykr Dec 25, 2020
cfaec9b
fixed case note save error
kirykr Dec 28, 2020
5aa9ddd
fixed bugs upgrading rails 4 to 5
kirykr Dec 29, 2020
786664c
fixed error in client_enrolled_program_trackings_controller.rb, permi…
kirykr Jan 4, 2021
073b326
fixed permitted params in ClientEnrollmentConcern#client_enrollment_p…
kirykr Jan 4, 2021
fc64f30
fixed save client case required error
kirykr Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.3
2.5.3
133 changes: 72 additions & 61 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,100 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'rails', '4.2.2'
ruby '2.5.3'
# gem 'rails', '4.2.2'
gem 'rails', '~> 5.2', '<= 5.2.4.4'
gem 'pg', '~> 0.18.4'
gem 'puma', '~> 3.11'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'sass-rails', '~> 5.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jbuilder', '~> 2.0'
gem 'simple_form', '~> 3.2'
gem 'bootstrap-sass', '~> 3.3.5'
gem 'devise', '~> 3.5', '>= 3.5.2'
gem 'haml-rails', '~> 0.9'
gem 'dotenv-rails', '~> 2.0.2'
gem 'roo', '~> 2.2'
gem 'fog'
gem 'sass-rails', '~> 6.0'
gem 'uglifier', '~> 4.2'
gem 'coffee-rails', '~> 5.0'
gem 'bootsnap', '>= 1.1.0', require: false
gem 'mini_racer', platforms: :ruby
gem 'jbuilder', '~> 2.10', '>= 2.10.1'
gem 'simple_form', '~> 5.0', '>= 5.0.3'
gem 'bootstrap-sass', '~> 3.4', '>= 3.4.1'
gem 'devise', '~> 4.7', '>= 4.7.3'
gem 'haml-rails', '~> 2.0', '>= 2.0.1'
gem 'dotenv-rails', '~> 2.7', '>= 2.7.6'
gem 'roo', '~> 2.8', '>= 2.8.3'
gem 'fog-aws', '~> 3.3'
gem 's3'
gem 'ffaker', '~> 2.1.0'
gem 'draper', '~> 2.1'
gem 'datagrid', '~> 1.4.2'
gem 'ffaker', '~> 2.17'
gem 'draper', '~> 4.0', '>= 4.0.1'
gem 'datagrid', '~> 1.6', '>= 1.6.1'
gem 'active_model_serializers'
gem 'sinatra', require: false
gem 'rack-cors', require: 'rack/cors'
gem 'rails-erd'
gem 'phony_rails', '~> 0.12.11'
gem 'phony_rails', '~> 0.14.13'
gem 'typhoeus'
gem 'foreman', '~> 0.78.0'
gem 'cancancan', '~> 1.13', '>= 1.13.1'
gem 'pundit', '~> 1.1'
gem 'tinymce-rails', '~> 4.5.6'
gem 'bootstrap-datepicker-rails', '~> 1.5'
gem 'foreman', '~> 0.87.2'
gem 'cancancan', '~> 3.1'
gem 'pundit', '~> 2.1'
gem 'tinymce-rails', '~> 5.6', '>= 5.6.2.1'
gem 'bootstrap-datepicker-rails', '~> 1.9', '>= 1.9.0.1'
gem 'x-editable-rails', '~> 1.5', '>= 1.5.5.1'
gem 'select2-rails', '~> 3.5.9.3'
gem 'doorkeeper', '~> 4.4', '>= 4.4.3'
gem 'devise_token_auth', '~> 0.1.37'
gem 'omniauth', '~> 1.3', '>= 1.3.1'
gem 'select2-rails', '~> 4.0', '>= 4.0.13'
gem 'doorkeeper', '~> 5.4'
gem 'devise_token_auth'
gem 'omniauth', '~> 1.9', '>= 1.9.1'
gem 'jquery-validation-rails'
gem 'google-api-client', '~> 0.10', require: 'google/apis/calendar_v3'
gem 'fullcalendar-rails', '~> 3.2.0.0'
gem 'momentjs-rails', '~> 2.17.1'
gem 'google-api-client', '~> 0.23.9', require: 'google/apis/calendar_v3'
gem 'fullcalendar-rails', '~> 3.9'
gem 'momentjs-rails', '~> 2.20', '>= 2.20.1'
gem 'kaminari'
gem 'jquery-datatables-rails', '~> 3.4'
gem 'friendly_id', '~> 5.1.0'
gem 'wicked_pdf', '~> 1.0', '>= 1.0.6'
gem 'wkhtmltopdf-binary-edge', '~> 0.12.3.0'
gem 'browser', '~> 2.1'
gem 'whenever', '~> 0.9.4'
gem 'thredded', '~> 0.6.1'
gem 'cocoon', '~> 1.2', '>= 1.2.9'
gem 'paper_trail', '~> 5.2'
gem 'carrierwave', '~> 1.1.0'
gem 'mini_magick', '~> 4.5'
gem 'chartkick', '~> 3.4'
gem 'font-awesome-rails', '~> 4.7'
gem 'spreadsheet', '~> 1.1.3'
gem 'apartment', '~> 1.2'
gem 'dropzonejs-rails', '~> 0.7.3'
gem 'bourbon', '~> 4.2'
gem 'neat', '~> 1.8'
gem 'sidekiq', '~> 4.1.0'
gem 'mongoid', '~> 5.2', '>= 5.2.1'
gem 'where-or', '~> 0.1.6'
gem 'dotiw', '~> 4.0.1'
gem 'friendly_id', '~> 5.4', '>= 5.4.1'
gem 'wicked_pdf', '~> 2.1'
gem 'wkhtmltopdf-binary-edge', '~> 0.12.6.0'
gem 'browser', '~> 5.1'
gem 'whenever', '~> 1.0'
gem 'thredded', '~> 0.16.4'
gem 'cocoon', '~> 1.2', '>= 1.2.15'
gem 'paper_trail', '~> 10.0', '>= 10.0.1'
gem 'paper_trail-association_tracking', '~> 2.1', '>= 2.1.1'
gem 'carrierwave', '~> 2.1'
gem 'mini_magick', '~> 4.11'
gem 'chartkick', '~> 3.4', '>= 3.4.2'
gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.5'
gem 'spreadsheet', '~> 1.2', '>= 1.2.6'
gem 'apartment', '~> 2.2', '>= 2.2.1'
gem 'dropzonejs-rails', '~> 0.8.5'
gem 'bourbon', '~> 7.0'
gem 'neat', '~> 1.7', '>= 1.7.4'
gem 'sidekiq', '~> 5.2', '>= 5.2.9'
gem 'mongoid', '~> 6.1', '>= 6.1.1'
gem 'dotiw', '~> 5.2'
gem 'text', '~> 1.3', '>= 1.3.1'
gem 'acts_as_paranoid', '~> 0.6.1'
gem 'ancestry', '~> 3.0', '>= 3.0.5'
gem 'acts_as_paranoid', '~> 0.7.0'
gem 'ancestry', '~> 3.2', '>= 3.2.1'
gem 'sysrandom', '~> 1.0', '>= 1.0.5'
gem 'write_xlsx', '~> 0.85.7'
gem 'caxlsx', '~> 2.0', '>= 2.0.2'
gem 'react-rails', '~> 2.6.0'
gem 'webpacker', '~> 4.0.7'
gem 'write_xlsx', '~> 0.86.0'
gem 'caxlsx', '~> 3.0', '>= 3.0.3'
gem 'react-rails', '~> 2.6', '>= 2.6.1'
gem 'webpacker', '~> 5.2', '>= 5.2.1'
gem 'jquery_query_builder-rails', '~> 0.5.0'
gem 'globalize', '~> 5.1.0'
gem 'enumerize', '~> 2.3.1'
gem 'globalize', '~> 5.3'
gem 'enumerize', '~> 2.3', '>= 2.3.1'
gem 'ulid', '~> 1.2'
gem 'dalli', '~> 2.7', '>= 2.7.11'
gem 'actionpack-page_caching', '~> 1.2', '>= 1.2.3'
gem 'actionpack-action_caching', '~> 1.2', '>= 1.2.1'

group :development, :test do
gem 'byebug', platforms: %i[mri mingw x64_mingw]
gem 'pry'
gem 'rspec-rails', '~> 4.0.0'
gem 'factory_girl_rails', '~> 4.5'
gem 'rspec-rails'
gem 'factory_girl_rails', '~> 4.9'
gem 'launchy', '~> 2.4', '>= 2.4.3'
gem 'capybara', '~> 2.15.4'
gem 'poltergeist', '~> 1.9.0'
gem 'phantomjs'
gem 'shoulda-whenever', '~> 0.0.2'
gem 'bullet', '5.4.3'
gem 'bullet', '~> 6.1'
gem 'mongoid-rspec', '~> 4.0', '>= 4.0.1'
gem 'thin', '~> 1.7'
gem 'danger', '~> 5.16', '>= 5.16.1'
Expand All @@ -102,7 +112,7 @@ end

group :development do
gem 'letter_opener', '~> 1.4.1'
gem 'letter_opener_web', '~> 1.3', '>= 1.3.4'
gem 'letter_opener_web'
gem 'rubocop', '~> 0.47.1', require: false
gem 'capistrano', '3.9.0'
gem 'capistrano-rails', '~> 1.1.1'
Expand All @@ -125,3 +135,4 @@ group :test do
end

gem "sentry-raven", "~> 2.13"
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
Loading