Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !196

Merged
Opened Oct 03, 2022 by François C.@fracolo 
  • Report abuse
Report abuse

Adaptation supercoop supercafoutch

×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b adaptation_supercoop_supercafoutch origin/adaptation_supercoop_supercafoutch

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout dev_cooperatic
git merge --no-ff adaptation_supercoop_supercafoutch

Step 4. Push the result of the merge to GitLab

git push origin dev_cooperatic

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 29
  • Pipelines 12
  • Changes 52
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Damien Moulard @DamienM

    added 1 commit

    • 9479e21d - linting

    Compare with previous version

    Oct 03, 2022

    added 1 commit

    • 9479e21d - linting

    Compare with previous version

    added 1 commit <ul><li>9479e21d - linting</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/196/diffs?diff_id=1811&start_sha=a91c4f1888bc61ff62ee48af47d3f6f17d2216d3)
    Toggle commit list
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Oct 03, 2022
    Resolved by Damien Moulard Oct 03, 2022
    members/models.py
    1670 1696 coop_logger.error("easy_validate_shift_presence : %s %s", str(coop_id), str(e))
    1671 1697 return res
    1672 1698
    1699 class CagetteService(models.Model):
    • Damien Moulard @DamienM commented Oct 03, 2022
      Developer

      est-ce pertinent de mettre ce modèle CagetteService dans le module members ?

      est-ce pertinent de mettre ce modèle `CagetteService` dans le module members ?
    • François C. @fracolo commented Oct 03, 2022
      Master

      C'est vrai que c'est plutôt dans le module shift sa place

      C'est vrai que c'est plutôt dans le module shift sa place
    • Damien Moulard @DamienM

      changed this line in version 3 of the diff

      Oct 03, 2022

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/196/diffs?diff_id=1812&start_sha=9479e21da15b3a0efe63f5ef9f62771e47ac74f6#6be34c5b7587798cd95e26b50ffbd7bf1cc7a73f_1699_1275)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard
    @DamienM started a discussion on an old version of the diff Oct 03, 2022
    Resolved by Damien Moulard Oct 03, 2022
    outils/config.md
    131 131
    132 132 La Cagette use False to implement custom rules
    133 133
    134 - CAN_CREATE_BINOME = True (by default)
    135
    136 If set to False, in new member creation form, a member can be selected to be associated with.
    • Damien Moulard @DamienM commented Oct 03, 2022
      Developer

      if set to True, plutôt ?

      `if set to True`, plutôt ?
    • François C. @fracolo commented Oct 03, 2022
      Master

      exact

      exact
    • Damien Moulard @DamienM

      changed this line in version 3 of the diff

      Oct 03, 2022

      changed this line in version 3 of the diff

      changed this line in [version 3 of the diff](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/196/diffs?diff_id=1812&start_sha=9479e21da15b3a0efe63f5ef9f62771e47ac74f6#d456e9893f58033eecec54f7b18bde7e56731720_136_136)
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM

    added 1 commit

    • dba4831f - change Services & Service models to shifts module

    Compare with previous version

    Oct 03, 2022

    added 1 commit

    • dba4831f - change Services & Service models to shifts module

    Compare with previous version

    added 1 commit <ul><li>dba4831f - change Services &amp; Service models to shifts module</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/196/diffs?diff_id=1812&start_sha=9479e21da15b3a0efe63f5ef9f62771e47ac74f6)
    Toggle commit list
  • Damien Moulard @DamienM

    resolved all discussions

    Oct 03, 2022

    resolved all discussions

    resolved all discussions
    Toggle commit list
  • Damien Moulard @DamienM

    merged

    Oct 03, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit eb1e61d0

    Oct 03, 2022

    mentioned in commit eb1e61d0

    mentioned in commit eb1e61d0d08b707d0b37bba0c10dbf98114f2921
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: cooperatic-foodcoops/third-party!196
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.