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.

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

build: Upgrade LARA (feature branch) #1174

Draft
wants to merge 36 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3ed0f05
build: Upgrade LARA (feature branch)
dougmartin Oct 7, 2024
7c144c6
chore: LARA Upgrade: organize gems (PT-186836253)
emcelroy Oct 8, 2024
350a053
Remove more unused gems.
lublagg Oct 9, 2024
806779d
Add newrelic_rpm back in due to failing tests.
lublagg Oct 9, 2024
7d8b6ef
Merge pull request #1175 from concord-consortium/organize-gems
lublagg Oct 9, 2024
2f790a2
Upgrade rails to 4.0.13 + update dependencies.
lublagg Oct 10, 2024
af9cf84
chore: resolve gem dependency issues
emcelroy Oct 15, 2024
1bd6d61
chore: devise key config
emcelroy Oct 15, 2024
ed17d30
chore: specify method for routes that use match
emcelroy Oct 15, 2024
c0be18e
chore: disable no-longer-supported token authentication parts of user.rb
emcelroy Oct 15, 2024
8a95bbf
Added gem status/version table to lara-upgrade.md
dougmartin Oct 16, 2024
5bfeda7
chore: cancancan minor version upgrade
emcelroy Oct 16, 2024
274ad5b
chore: gem version adjustments
emcelroy Oct 16, 2024
03fdfce
chore: more gem version adjustments
emcelroy Oct 17, 2024
6839aa1
Confirm upgrade versions for dependencies.
lublagg Oct 17, 2024
7da82e0
Make updates outlined in Ruby on Rails Upgrade guide.
lublagg Oct 17, 2024
c5b60b8
chore: update old migration code
emcelroy Oct 18, 2024
5ca8bda
chore: remove whiny_nils from environments, add eager_load
emcelroy Oct 18, 2024
61457be
chore: replace ^ with \A and $ with \z in validation regex
emcelroy Oct 18, 2024
4d5ed7d
chore: temporarily reinstate attr_accessible lines
emcelroy Oct 18, 2024
d79ab03
fix: scope / method name clash
emcelroy Oct 18, 2024
aebfb1a
chore: update upgrade table, update some deprecated code
emcelroy Oct 18, 2024
8dbbaf9
Change railslts-version back to 3.2.22.2
lublagg Oct 21, 2024
e8455b2
Specify version of sassc to use
lublagg Oct 21, 2024
5ac6264
Add devise secret key
lublagg Oct 21, 2024
43ee909
Fix faker deprecation warnings.
lublagg Oct 21, 2024
32d77d8
Fix deprecation warnings about find method with includes.
lublagg Oct 21, 2024
8a2ca58
Fix default_scope deprecation warnings.
lublagg Oct 21, 2024
73fedf5
Fix: failing test due to partial loading file.
lublagg Oct 21, 2024
0f1408f
Fix: deprecation warnings for self.scoped .find + .first
lublagg Oct 21, 2024
1ed5381
Fix: syntax deprecation warnings
lublagg Oct 21, 2024
663fd88
fix: rspec deprecation warnings
emcelroy Oct 21, 2024
da2683f
Merge pull request #1176 from concord-consortium/186836718-upgrade-to…
emcelroy Oct 22, 2024
254cd48
chore: update lara upgrade doc with new Rails 4.2 version
emcelroy Oct 22, 2024
2b45b3f
chore: remove whitelist_attributes config that has no effect anymore
emcelroy Oct 22, 2024
6766666
Merge pull request #1185 from concord-consortium/186836718-rails-4.0.…
emcelroy Oct 22, 2024
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
181 changes: 91 additions & 90 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
# source 'https://gems.railslts.com' do
gem 'actionmailer', :require => false
gem 'actionpack', :require => false
gem 'activemodel', :require => false
gem 'activerecord', :require => false
gem 'activeresource', :require => false
gem 'activesupport', :require => false
gem 'rails', '~> 4.0.13'
gem 'railslts-version', "= 3.2.22.2", :require => false
gem 'railties', :require => false
# end

source "https://rubygems.org"

group :production do
gem "unicorn"
end

group :assets do
gem "sass-rails", "~> 3.2"
gem "coffee-rails", "~> 3.2"
gem "compass-rails", "~> 3.0"
# group :assets do
gem "coffee-rails", '~> 4.2', '>= 4.2.2'
gem "compass-blueprint", "~> 1.0"
gem "uglifier", "~> 4.1"
gem "turbo-sprockets-rails3", "~> 0.3"
end
gem "compass-rails", "~> 3.1.0"
gem "sass-rails", "~> 5.0", ">= 5.0.7"
gem "sassc", "~> 2.1.0"
gem "turbo-sprockets-rails4", "~> 1.2.5"
gem "uglifier", "~> 4.2"
# end

# 2021-11-01 -- NP: rails-assets.org SSL certificate has expired.
# For now we have just put the JS and CSS files for drawing tool and its deps
Expand All @@ -25,96 +38,84 @@ end
# end

group :development do
gem "binding_of_caller", "~> 0.7"
# bullet 5.5 does not support AR 3
gem 'bullet', '~> 5.4.3', '>= 5.4.3'
gem "better_errors", "~> 1.1"
gem "sextant", "~> 0.2"
gem "xray-rails", "~> 0.1"
gem "guard-rspec", "~> 4.6", {:require=>false}
gem "quiet_assets", "~> 1.1"
gem "webrick", "~> 1.3"
gem "capistrano", "~> 2.15"
gem "capistrano-autoscaling", "~> 0.0", {:git=>"https://github.com/concord-consortium/capistrano-autoscaling.git", :branch=>"concord"}
gem "capistrano-cowboy", "~> 0.1"
gem "lol_dba", "~> 1.6", {:require=>false}
gem "brakeman", "~> 2.4", {:require=>false}
gem "request-log-analyzer", "~> 1.12", {:require=>false}
gem "better_errors", "~> 2.0.0", ">= 2.0.0"
# gem "binding_of_caller", "~> 0.7"
# gem "brakeman", "~> 2.4", {:require=>false}
gem 'bullet', "~> 5.4.3"
# gem "capistrano", "~> 2.15"
# gem "capistrano-autoscaling", "~> 0.0", {:git=>"https://github.com/concord-consortium/capistrano-autoscaling.git", :branch=>"concord"}
# gem "capistrano-cowboy", "~> 0.1"
# gem "guard-rspec", "~> 4.6", {:require=>false}
# gem "lol_dba", "~> 1.6", {:require=>false}
# gem "quiet_assets", "~> 1.1"
# gem "request-log-analyzer", "~> 1.12", {:require=>false}
# gem "sextant", "~> 0.2"
# gem "webrick", "~> 1.3"
# gem "xray-rails", "~> 0.1"
end

group :test do
gem "webmock", "~> 1.20"
gem 'simplecov', require: false
gem "webmock", "~> 3.8.3", "= 3.8.3"
end

group :test, :development do
gem "rb-fsevent", "~> 0.9"
gem "spring-commands-rspec", "~> 1.0"
gem "spring", "~> 1.2"
gem "test-unit", "~> 3.0"
gem "rspec-rails", "~> 3.8"
gem "rspec-activemodel-mocks", "~> 1.0"
gem "ci_reporter", "~> 1.7"
gem "factory_girl_rails", "~> 4.3", {:require=>false}
gem "faker", "~> 1.2"
gem "capybara", "~> 2.4"
gem "timecop", "~> 0.6"
gem "poltergeist", "~> 1.5"
gem "jasmine", "~> 2.2"
gem "jasmine-jquery-rails", "~> 2.0"
gem "launchy", "~> 2.4"
gem "pry"
gem 'pry-byebug'
gem "capybara", "~> 2.18"
# gem "ci_reporter", "~> 1.9.2"
gem "factory_girl_rails", "~> 4.5", ">= 4.5.0", :require=>false
gem "faker", "~> 2.2", ">= 2.2.1"
gem "jasmine", "~> 2.99.0"
gem "jasmine-jquery-rails", "~> 2.0", ">= 2.0.3"
gem "launchy", "~> 2.5", ">= 2.5.2"
gem "poltergeist", "~> 1.18", ">= 1.18.1"
# gem "pry"
# gem 'pry-byebug'
# gem "rb-fsevent", "~> 0.9"
gem "rspec-activemodel-mocks", '~> 1.2', '>= 1.2.1'
gem "rspec-rails", '~> 3.8'
gem "spring", "~> 1.7", ">= 1.7.2"
gem "spring-commands-rspec", "~> 1.0", ">= 1.0.4"
gem "test-unit", "~> 3.6", ">= 3.6.2"
gem "timecop", "~> 0.9", ">= 0.9.10"
end

gem "highline", "~> 1.6"
source 'https://gems.railslts.com' do
gem 'rails', '~> 3.2.22'
gem 'actionmailer', :require => false
gem 'actionpack', :require => false
gem 'activemodel', :require => false
gem 'activerecord', :require => false
gem 'activeresource', :require => false
gem 'activesupport', :require => false
gem 'railties', :require => false
gem 'railslts-version', :require => false
end
gem 'rake', '< 11'
gem "jquery-rails", "~> 3.1.3"
gem "jquery-ui-rails", "~> 4.1"
gem "haml", "~> 4.0"
gem "dynamic_form", "~> 1.1"
gem "acts_as_list", "~> 0.3"
gem "nested_form", "~> 0.3"
gem "gon", "~> 5.2"
gem "multi_json", "~> 1.11"
gem "devise", "~> 3.0"
gem "cancancan", "~> 1.10"
gem "omniauth", "~> 1.3.2"
gem "omniauth-oauth2", "~> 1.1", {:git=>"https://github.com/intridea/omniauth-oauth2.git"}
gem "default_value_for", "~> 2.0"
gem "tinymce-rails", "~> 4.7"
gem "yaml_db", "~> 0.2", {:git=>"https://github.com/lostapathy/yaml_db.git"}
gem "aws-sdk", "~> 1.66"
gem "aws-ses", git: "https://github.com/zebitex/aws-ses.git", ref: "78-sigv4-problem"
gem "uuidtools", "~> 2.1"
gem "httparty", "~> 0.12"
gem "exception_notification", "~> 4.0"
gem 'newrelic_rpm', '~> 4.6', '>= 4.6.0.338'
gem "rack-environmental", "~> 1.3"
gem "sqlite3", "~> 1.3"
gem "mysql2", "~> 0.3"
gem "delayed_job_active_record", "~> 4.0"
gem "delayed_job_web", "~> 1.2"
gem "daemons", "~> 1.1"
gem "font-awesome-rails", "~> 4.3"
gem "chosen-rails", "~> 1.0"
gem "safe_yaml", "~> 1.0"
gem "will_paginate", "~> 3.0"
gem "useragent", "~> 0.10"
gem "acts_as_list", '~> 0.9.19'
gem "aws-sdk", "~> 1.66.0"
gem "aws-ses", "0.7.1", git: "https://github.com/zebitex/aws-ses.git", ref: "78-sigv4-problem"
gem "cancancan", "~> 1.17"
gem "chosen-rails", "~> 1.10"
gem "daemons", "~> 1.4", ">= 1.4.1"
gem "default_value_for", "~> 3.6"
gem "delayed_job_active_record", '~> 4.1', '>= 4.1.10'
gem "delayed_job_web", '~> 1.4', '>= 1.4.4'
gem "devise", '~> 3.5', '>= 3.5.10'
gem "dynamic_form", "~> 1.2"
gem "exception_notification", '~> 4.4', '>= 4.4.3'
gem "font-awesome-rails", '~> 4.7', '>= 4.7.0.8'
gem "gon", "~> 6.4.0"
gem "haml", "~> 4.0.7"
gem "highline", "~> 1.7.3"
gem "httparty", "~> 0.21"
gem "jquery-rails", '~> 3.1', '>= 3.1.5'
gem "jquery-ui-rails", '~> 4.2.1'
gem "multi_json", "~> 1.15"
gem "mysql2", "= 0.3.21"
gem "nested_form", "~> 0.3.2"
gem 'newrelic_rpm', '= 4.8.0.341'
gem "nokogiri", ">= 1.10.10"
gem "omniauth", "~> 1.4.2"
gem "omniauth-oauth2", "1.3"
gem 'protected_attributes'
gem "rack-cors", "~> 1.0.3", {:require => 'rack/cors'}
gem "rack-environmental"#, "~> 1.3"
gem 'rack-secure_samesite_cookies', {:git => 'https://github.com/concord-consortium/secure-samesite-cookies.git', :tag => 'v1.0.2'}
gem 'rake', '~> 13.2', '>= 13.2.1'
gem "ribbons-rails", "~> 0.0", {:git=>"https://github.com/concord-consortium/ribbons-rails.git"}
gem "spreadsheet", "~> 1.0"
gem "nokogiri", ">= 1.8.5"
gem "rack-cors","~> 0.4.1", :require => 'rack/cors'
gem "test-unit", "~> 3.0"
gem 'rack-secure_samesite_cookies', {:git => 'https://github.com/concord-consortium/secure-samesite-cookies.git', :tag => 'v1.0.2'}
gem "safe_yaml", "~> 1.0.5"
gem "spreadsheet", "~> 1.1.2", "= 1.1.2"
# # gem "sqlite3", "~> 1.3"
# # gem "test-unit", "~> 3.0"
gem "tinymce-rails", '~> 4.9.4', "= 4.9.4"
gem "useragent", "~> 0.16.10"
gem "uuidtools", "~> 2.1.5", "= 2.1.5"
gem "will_paginate", "~> 4.0.1"
Loading
Loading