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

test merge stagin into master #994

Closed
wants to merge 39 commits into from
Closed

test merge stagin into master #994

wants to merge 39 commits into from

Conversation

lodewiges
Copy link
Contributor

Checklist

  • Merged database migrations into 1 database migration.
  • Tested database migrations from origin/staging (git checkout staging ; git pull ; bundle exec rails db:reset ; git checkout BRANCH ; bundle exec rails db:migrate).

Summary

Shortly summarize the changes in this pull request. Does it concern changes in the UI, add some screenshots. Are there related issues solved? Please, mention them (with 'fixes #xyz', see https://github.com/blog/1506-closing-issues-via-pull-requests), so they can be resolved automatically when merging this pull request.

Other information

If there is some other relevant and important information for this pull request, mention it here. For example, related pull requests or newly introduced conventions, packages or other dependencies.

renovate bot and others added 30 commits November 21, 2024 20:32
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* edited the env file

* changed company name to UTF-8
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* feat(tests): add code coverage reporting

* fix: correct coverage path

* refactor: use simplecov-lcov

* fix: indentation in Gemfile.lock

* fix: remove test filters

* feat(README): add badge

* refactor: try tokenless report uploading

* chore: update codecov-action

* chore: update codecov-action

* fix(cd): pass CODECOV_TOKEN To ci
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Intial commit

* updated apliction.rb

* Fixed mistake in credentials

* Made it so the file is backwards compatiable

* Fixed a typo

* Update amber_oauth2.rb

remove tomato paramater
* intial commit

* Fix typo

* update tomato to sofia

* updated with suggestion
* refactor: update workflow checks directly

* fix: correct type
* Added secretary role and changed views and policies accordingly

* Changed what the renting manager has access to + cleanup

* Merged archived pricelists and bugfixes

* Fixed invoice index inefficient database queries

* Added tests for renting-manager

* Altered policies and added some more tests

* Fixed some linting

* Made unshowable users in activities index page unclickable

* Fixed rubocop warnings

* Fixed indentation

* Update spec/controllers/price_lists_controller/create_spec.rb

fixed spelling

* Update app/views/index/index.html.erb

fixed inconsistent order

* Update app/policies/activity_policy.rb

fixed inconsistent order

* Update app/policies/price_list_policy.rb

fixed inconsistent order

* Update app/policies/user_policy.rb

fixed inconsistent order

* Changed orde roles within policies

* Fixed Lint and changed default text serch bar

* Update app/views/index/index.html.erb

* Fixed Bug and stupid mistake of myself

* fix test reintroduced bug

* fixed the bug

* Update app/views/invoices/show.html.erb

* fixed ruby lint

---------

Co-authored-by: lodewiges <[email protected]>
Co-authored-by: Jorai Geertsema <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore(deps): update all non-major bundler dependencies

* Update dependencies

* Fix lint

* put json back

* pundit deprication fix

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Wilco van Beijnum <[email protected]>
Co-authored-by: Ellen <[email protected]>
Co-authored-by: lodewiges <[email protected]>
Co-authored-by: Jorai Geertsema <[email protected]>
* chore(deps): update all non-major npm dependencies

* Fixed webpacker not compiling

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorai Geertsema <[email protected]>
* chore(deps): update all non-major bundler dependencies

* update deprecations and remove rails version bump

* upgrade rails defaults to 7.0

* removed test code

* upgraded rubocop to 1.50.2

* change rails version rubocop & webpacker change

* Fixed Lint

* license bump

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorai Geertsema <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
renovate bot and others added 9 commits January 8, 2025 17:41
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore(deps): update dependency ruby to v3.4.1

* upgrade to ruby 3.2.6

* speficied netcat variant

* update nodejs to proper version

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorai Geertsema <[email protected]>
* chore(deps): update dependency ruby to v3.4.1

* Update Dockerfile

* Update .ruby-version

* Update Dockerfile

* Update Dockerfile

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: lodewiges <[email protected]>
* refactor: remove RAILS_MASTER_KEY from ci

* fix(ci): update indentation

* test: precompile assets on test too

* fix(ci): update indentation

* chore: bundle update bullet

* fix: comment bundle config

* revert: test: precompile assets on test too

* fix: revert env changes in continuous-integration.yml

* fix: indentation

* fix: indentation

* fix: readd POSTGRES_HOST

* fix: pass RAILS_MASTER_KEY to ci step

* chore: trigger build

* chore: fix lint

* chore: remove unnecessary secret mount

* remove spaces continuous-integration.yml

* Update continuous-integration.yml

* Update continuous-integration.yml

* Fix?

* Update continuous-integration.yml

* updated gemfile

* edited ablication.rb

* Remove depraction error

---------

Co-authored-by: lodewiges <[email protected]>
Co-authored-by: Jorai Geertsema <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@lodewiges lodewiges closed this Jan 10, 2025
@lodewiges lodewiges reopened this Jan 14, 2025
@lodewiges lodewiges closed this Jan 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants