Skip to content

Rails 6 1 #241

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

Jump to bottom
Draft
jmolineEA wants to merge 174 commits into
base: rails_5
Choose a base branch
from
Draft

Rails 6 1 #241

jmolineEA wants to merge 174 commits into from

Conversation

@jmolineEA
Copy link

@jmolineEA jmolineEA commented Nov 22, 2023

No description provided.

ajporterfield and others added 30 commits March 9, 2022 09:25
@ajporterfield
Merge pull request #155 from network-for-good/rails_5
9d4804c 
Merge rails_5 into master
@ajporterfield
Fix broken image in dm
0116ace
@ajporterfield
Progress on Rails 6 update
aa3920e
@ajporterfield
Fix bad image reference
0a01f07
@ajporterfield
Merge branch 'master' of https://github.com/network-for-good/nfg_csv_…
e126bcd 
…importer into rails_6
@ajporterfield
Fixes deprecations in view specs
72dcd4d
@ajporterfield
Updates Gemfile.lock to use Rails 6.0.x to help with deprecations
47b5c28
@ajporterfield
Spec fixes
464c15d
@ajporterfield
Spec fixes
9237364
@ajporterfield
Switches back to using update
cc735c6
@subelsky
refactor NfgCsvImporter::FieldsMapper to fix recursive regexp definit…
7e394a9 
…ion bug in column_header_mapped_to_aliases method
@subelsky
Merge branch 'hotfix/PRDSUP-701_fix_import_recursive_regex_bug'
8279519
@subelsky @ajporterfield
refactor NfgCsvImporter::FieldsMapper to fix recursive regexp definit…
33d5485 
…ion bug in column_header_mapped_to_aliases method
@ajporterfield
Merge branch 'master' of https://github.com/network-for-good/nfg_csv_…
72332ab 
…importer into rails_6
updates ruby version
7a5096c
updates nfg_ui and nfg_onboarder to use rails_6 branches
f4cb1df
rebundles nfg_onboarder now that it correctly leverages rails_6 branc…
98b423b 
…hes for nfg_ui
@ajporterfield
Updates Gemfile so that reform-rails can be updated
49024b7
@ajporterfield
Updates reform-rails
2993437
@ajporterfield
Another attempt at updating reform-rails
d76f624
@ajporterfield
AIO-970 Fix up broken paths in FP since it's mounted to /admin/imports
560851f
sets sass-rails to ~> 6 so that nfg_ui can update
d6ff507
bundles nfg_ui to 0.14.3.1
8a01070
updats config.yml to run ruby 2.7.5
0b3e2c9
rebundles using latest nfg_ui
690a06d
updates branch back to rails_6
0e8d852
Merge pull request #200 from network-for-good/feature/update_rails_6_…
ca906c9 
…to_nfg_ui_0_14_3_1

update rails 6 to nfg UI 0 14 3 1
updates nfg_ui to 0.14.4.1 and updates onboarder
3dd4a6d
moves back to rails_6 branch for onboarder
92e8428
Merge pull request #204 from network-for-good/feature/update_rails_6_…
02415ad 
…nfg_ui_0_14_4_1

updates nfg_ui to 0.14.4.1 on rails_6
aravindpudayoor and others added 30 commits February 28, 2025 21:42
[#NFG-1179] RUby version upgrade
1d09a4b
Merge branch 'rails_6_1' into ruby_upgrade_3_2_5
a98ca17
[#NFG-1179] updates circle config
8a265ff
updates gems
ba4b9f6
spec fix
fcc033b
@pawan-kc
Spec fixes
a3b4c66
@pawan-kc
Few more spec fixes related to rails 7 upgrade
a1c52fb
@pawan-kc
Spec fixes
783dc92
@pawan-kc
fix specs
f200648
[#NFG-1179] Spec fixes
f471f5a
[#NFG-1179] more spec fixes
da8c4aa
[#NFG-1179] Upgrades ruby to latest 3.4.2
27fd2f3
[#NFG-1179] Adds images to the manifest
3724623
@pawan-kc
[NFG-1171] Bump version number
a5a9bfb
@pawan-kc
[NFG-1171] Fix path not loading on auction app issue
4df420b
@pawan-kc
[NFG-1171] bump version number
1471086
Merge branch 'ruby_upgrade_3_2_5' into rails_7_2
acb9190
merge conflict fix
34c98ab
spec fix
a35e67a
@pawan-kc
Merge branch 'rails_7_2' of github.com:network-for-good/nfg_csv_impor…
41cb244 
…ter into rails_7_2
@kcpavan
Merge pull request #247 from network-for-good/ruby_upgrade_3_2_5
9d6d8dc 
[#NFG-1179] Ruby version upgrade
@pawan-kc
Merge branch 'rails_6_1' into rails_7_2
1ea1ad6
@pawan-kc
Update NFG UI gem version
5bc487e
@pawan-kc
[NFG-1171] update nfg_onboarder version
9433b02
@pawan-kc
bump version number
bd7c75e
@pawan-kc
[#NFG-1171] update nfg_onboarder gem
d6160ac
@pawan-kc
[#NFG-1171] precompile assets in CI
e01136b
@pawan-kc
[#NFG-1171] fix asset compile issue
5290fcd
@pawan-kc
bump version number
7244ec8
@kcpavan
Merge pull request #246 from network-for-good/rails_7_2
3ee04ff 
[#NFG-1171] Update rails version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.