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

[2.2] Migrate terms of use models to the new app #1342

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

matti-lamppu
Copy link
Collaborator

@matti-lamppu matti-lamppu commented Sep 18, 2024

🛠️ Changelog

  • See title.
  • Old migrations will remain in place until everything is moved to not break the django migration system.
  • Should follow this guide (the short way).

🧪 Test plan

  • Automated tests

🚧 Dependencies

  • None

🎫 Tickets

@matti-lamppu matti-lamppu changed the title Move terms of use to the new app Migrate terms of use to the new app Sep 19, 2024
@matti-lamppu matti-lamppu force-pushed the migrate-terms branch 2 times, most recently from 464003d to 9d4c74c Compare September 23, 2024 07:30
Copy link

Triggered from #1342 by @​matti-lamppu.

Checking if we can fast forward migrate_services (89ac7a5) to migrate-terms (b942dcc).

Target branch (migrate_services):

commit 89ac7a567e27bc9e5a364a382ab1470e2bc3bce6 (HEAD -> migrate_services, origin/migrate_services)
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Fri Sep 27 04:13:10 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks
    
    for more information, see https://pre-commit.ci

Pull request (migrate-terms):

commit b942dcc1d6d058639f32b2e955737224dcf23ed8 (pull_request/migrate-terms)
Author: Matti Lamppu <matti.lamppu@vincit.fi>
Date:   Wed Sep 18 13:01:40 2024 +0300

    Move terms of use models to the new app

Can't fast forward migrate_services (89ac7a5) to migrate-terms (b942dcc). migrate_services (89ac7a5) is not a direct ancestor of migrate-terms (b942dcc). Branches appear to have diverged at cc568d2:

* 89ac7a567e27bc9e5a364a382ab1470e2bc3bce6 [pre-commit.ci] auto fixes from pre-commit.com hooks
| * b942dcc1d6d058639f32b2e955737224dcf23ed8 Move terms of use models to the new app
|/  
* cc568d21e1bac63060c32763a5cec728060d834f Move service models to the new app

commit cc568d21e1bac63060c32763a5cec728060d834f
Author: Matti Lamppu <matti.lamppu@vincit.fi>
Date:   Wed Sep 18 12:17:51 2024 +0300

    Move service models to the new app

Rebase locally, and then force push to migrate-terms.

@matti-lamppu matti-lamppu changed the title Migrate terms of use to the new app [2.2] Migrate terms of use to the new app Sep 27, 2024
@matti-lamppu matti-lamppu changed the title [2.2] Migrate terms of use to the new app [2.2] Migrate terms of use models to the new app Sep 27, 2024
Copy link

sonarqubecloud bot commented Oct 1, 2024

Base automatically changed from migrate_services to migrate-users-first October 1, 2024 14:32
@matti-lamppu matti-lamppu merged commit d3a9bb2 into migrate-users-first Oct 1, 2024
6 checks passed
@matti-lamppu matti-lamppu deleted the migrate-terms branch October 1, 2024 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactor Refactors something
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants