WIP: develop to foodsoft master diff #39

Draft

philipp wants to merge 12 commits from develop into master

philipp commented

2023-01-17 16:26:34 +01:00

Owner

There is no content yet.

philipp added 13 commits 2023-01-17 16:26:36 +01:00

0ca69ae8a2 rails up to 7.0and ruby to 2.7.2

6c910a75f2 mv lib to app/lib due to upgrade

26617e5a3f removing concerns from autoload path

64eed00291 resolve zeitwerk issues

5a07577afd make foodsoft run for dev on rails 7 and ruby 2.7

b02780f1ff fix mail file permission bug

d78abef560 fix database_config

3f114af193 replace apivore with rswag

d16aa19300 Add home controller test

Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>

d7591d46b9 Add controller tests

Co-authored-by: viehlieb <pf@pragma-shift.net>
Co-authored-by: Tobias Kneuker <tk@pragma-shift.net>

seperate expects

refactor login user calls

add more articles to test sorting with

fix: fix test for rails upgrade

e8d229b538 ruby rails 7 upgrade

c94b98835c fix articles controller test ActiveModell::Error

86e933cb25 bump Gemfile.lock

philipp force-pushed develop from 86e933cb25 to fb8ccfea4a

2023-01-17 16:35:24 +01:00

Compare

fgu added 1 commit 2023-02-02 10:15:15 +01:00

a7747c9e84 fix docker-compose

philipp added 1 commit 2023-02-09 17:21:15 +01:00

c487f0368a upgrade dockerfile to rails7

philipp added 1 commit 2023-02-09 17:22:46 +01:00

82d4ff0284 improve dockerfile caching

philipp added 1 commit 2023-02-10 12:51:04 +01:00

eb0e6b6e89 fix: use harmony mode in uglifier

philipp force-pushed develop from eb0e6b6e89 to 78da4feafe

2023-02-10 13:09:41 +01:00

Compare

philipp added 2 commits 2023-02-17 13:36:59 +01:00

782194cd08 change .search to .ransack for updated ransack gem

91a38bc73b move BigDecimal.new to BigDecimal()

flip added 1 commit 2023-03-23 12:04:18 +01:00

d61d7ca65f make deface work again

This pull request has changes conflicting with the target branch.

.rubocop_todo.yml
.ruby-version
Gemfile
Gemfile.lock
app/assets/javascripts/application_legacy.js
app/controllers/home_controller.rb
app/javascript/application.js
app/lib/apple_bar.rb
app/lib/articles_csv.rb
app/lib/bank_account_connector.rb

You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.

git checkout -b develop master

git pull origin develop

Step 2:

Merge the changes and update on Forgejo.

git checkout master

git merge --no-ff develop

git push origin master

No reviewers

No Label

No Milestone

No project

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Foodsoft/foodsoft#39

There is no content yet.