Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • 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
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !145

Merged
Opened Apr 18, 2025 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

user territory param to activate territory filter in flux admin & extend…

user territory param to activate territory filter in flux admin & extend territory and quartier params to all project, not only ssa

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b 7984-upgrade-quartier-and-subterritory-params origin/7984-upgrade-quartier-and-subterritory-params

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff 7984-upgrade-quartier-and-subterritory-params

Step 4. Push the result of the merge to GitLab

git push origin develop

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

    added 3 commits

    • 97b54889...afacd518 - 2 commits from branch develop
    • 5c36890c - Merge branch 'develop' into 7984-upgrade-quartier-and-subterritory-params

    Compare with previous version

    Apr 22, 2025

    added 3 commits

    • 97b54889...afacd518 - 2 commits from branch develop
    • 5c36890c - Merge branch 'develop' into 7984-upgrade-quartier-and-subterritory-params

    Compare with previous version

    added 3 commits <ul><li>97b54889...afacd518 - 2 commits from branch <code>develop</code></li><li>5c36890c - Merge branch &#39;develop&#39; into 7984-upgrade-quartier-and-subterritory-params</li></ul> [Compare with previous version](https://gl.cooperatic.fr/agplv3/kohinos-tav/merge_requests/145/diffs?diff_id=3978&start_sha=97b5488956f410bad422d2102aae15816d5e0ff4)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    added 1 commit

    • 706b6fe9 - hide/show subterritory filter also in admin adherent

    Compare with previous version

    Apr 22, 2025

    added 1 commit

    • 706b6fe9 - hide/show subterritory filter also in admin adherent

    Compare with previous version

    added 1 commit <ul><li>706b6fe9 - hide/show subterritory filter also in admin adherent</li></ul> [Compare with previous version](https://gl.cooperatic.fr/agplv3/kohinos-tav/merge_requests/145/diffs?diff_id=3979&start_sha=5c36890cb6cce0c5dfb825ac3ba15cbcf84cb1a5)
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    merged

    Apr 22, 2025

    merged

    merged
    Toggle commit list
  • Yvon Kerdoncuff @Yvon

    mentioned in commit e2c90d3a

    Apr 22, 2025

    mentioned in commit e2c90d3a

    mentioned in commit e2c90d3a123375811e1f5a9062214a0833cae4df
    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: agplv3/kohinos-tav!145
×

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.