Foodsoft/foodsoft

Fork 0

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

No description provided.

philipp added 13 commits

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

rails up to 7.0and ruby to 2.7.2 0ca69ae8a2

mv lib to app/lib due to upgrade 6c910a75f2

removing concerns from autoload path 26617e5a3f

resolve zeitwerk issues 64eed00291

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

fix mail file permission bug b02780f1ff

fix database_config d78abef560

replace apivore with rswag 3f114af193

Add home controller test d16aa19300

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

Add controller tests d7591d46b9

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

ruby rails 7 upgrade e8d229b538

fix articles controller test ActiveModell::Error c94b98835c

bump Gemfile.lock 86e933cb25

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

fix docker-compose a7747c9e84

philipp added 1 commit

2023-02-09 17:21:15 +01:00

upgrade dockerfile to rails7 c487f0368a

philipp added 1 commit

2023-02-09 17:22:46 +01:00

improve dockerfile caching 82d4ff0284

philipp added 1 commit

2023-02-10 12:51:04 +01:00

fix: use harmony mode in uglifier eb0e6b6e89

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

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

move BigDecimal.new to BigDecimal() 91a38bc73b

flip added 1 commit

2023-03-23 12:04:18 +01:00

make deface work again d61d7ca65f

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

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: develop to foodsoft master diff' (#39) from develop into master

Merge commit body

Reviewed-on: https://git.local-it.org/Foodsoft/foodsoft/pulls/39

Merge pull request 'WIP: develop to foodsoft master diff' (#39) from develop into master

Reviewed-on: https://git.local-it.org/Foodsoft/foodsoft/pulls/39

Checkout

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

git fetch -u origin develop:develop

git switch develop

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff develop

git switch develop

git rebase master

git switch master

git merge --ff-only develop

git switch develop

git rebase master

git switch master

git merge --no-ff develop

git switch master

git merge --squash develop