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

Jump to bottom

Peml integration #230

Open
wants to merge 41 commits into
base: staging
Choose a base branch
from
Open

Peml integration #230

wants to merge 41 commits into from

Conversation

awhicks
Copy link
Member

@awhicks awhicks commented Jan 26, 2024

No description provided.

ayaankazerouni and others added 30 commits June 3, 2020 16:13
@ayaankazerouni
First steps for rails 5.
931798a 
- Changed test db to use mysql2
- Removed squeel from Gemfile, need to remove any usages
@ayaankazerouni
Fix exercise-related active-record queries
72a7506 
and asset precompilation which got overridden by bin/update
@ayaankazerouni
Use SQL instead of ActiveRecord hashes
2e81b94 
for complex where queries, because rails is not inferring
table names correctly.
@ayaankazerouni
Replace squeel usage with vanilla active record.
b622a46
@ayaankazerouni
Manually fix merge conflicts in lock file
8562ecb
@ayaankazerouni
Update factory bot for incoming changes
3508544
@ayaankazerouni
Rails 5.1
0fd6b22
@ayaankazerouni
Rails 5.2
aeb2902
@ayaankazerouni
Fix deploy syntax
9a5b618
@ayaankazerouni
Remove obsolete config option; update mysql2
e026bb3
@ayaankazerouni
Fix schema issues and start Dockerizing
867339b
@ayaankazerouni
Regress sprockets to < 4 for the time being
0ad6022
@ayaankazerouni
Docker-compose for databases
eb0e28a
@ayaankazerouni
Dockerfile and Compose file improvements
5ea1de6
@ayaankazerouni
exception_handler config updates
947b93a
@ayaankazerouni
Get README from staging
2c34931
@ayaankazerouni
Merge branch 'staging' into rails-5-upgrade
ac51fba
@ayaankazerouni
Set deploy branch to rails-5-upgrade
1f51d4a
@ayaankazerouni
Merge branch 'staging' into rails-5-upgrade
47896a3
@awhicks
update models
4f8c6f6 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
update jobs
705d76e 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
update migrations
aa1e292 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
update Gemfile.lock
b35161c 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
update Dockerfile
c2ac771 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
change runservers for dev
9afd3d3 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
updated exception_handler and rails 5.1
01ed81a 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
added ssl for testing
2e0f489 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
Merge pull request #181 from web-cat/rails-5-upgrade-changes
b8cd412 
Rails 5 upgrade changes
@awhicks
removed ssl
9b71517 
Signed-off-by: Alex Hicks <[email protected]>
@awhicks
Merge branch 'staging' into rails-5-upgrade
681c5a3
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.
2 participants
@awhicks @ayaankazerouni