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
  • !220

Merged
Opened May 10, 2023 by François C.@fracolo 
  • Report abuse
Report abuse

#4394 : allow comitee members to add as many points they want

A new config.py exists : MINIMUM_SECONDS_BETWEEN_TWO_COMITEE_VALIDATION

When set to 0, no time controle is done (if not set, 3600 * 24 is considered)

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b 4709 origin/4709

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 4709

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 0
  • Commits 2
  • Pipelines 2
  • Changes 2
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 17058eca - ajoute nouveau parametre à config_lacagette.py et wording correction tournure de phrase

    Compare with previous version

    May 11, 2023

    added 1 commit

    • 17058eca - ajoute nouveau parametre à config_lacagette.py et wording correction tournure de phrase

    Compare with previous version

    added 1 commit <ul><li>17058eca - ajoute nouveau parametre à config_lacagette.py et wording correction tournure de phrase</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/220/diffs?diff_id=2197&start_sha=5848c7422b48b42e8e50194ea0500d0728b0bd22)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    May 11, 2023

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit 5790b181

    May 11, 2023

    mentioned in commit 5790b181

    mentioned in commit 5790b1815c31df23204ce9cf482b10bdf954a3da
    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!220
×

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.