WIP: Renater/select2 rebase (!10) · Merge Requests · AAI / SWITCHwayf

Merged

Opened Mar 25, 2019 by Geoffroy ARNOUD @geoffroya

Report abuse

WIP: Renater/select2 rebase

Overview 7
Commits 23
Changes 31

This code is deployed on our DEV environment (both standard and embedded). I see the following points that can be addressed - maybe in a next merge-request:

Use a single config param to choose between: standard dropdown, improved or select2
Manage the pre-selection of the last used IDP
Display the last used IDPs in embedded WAYF

Check out, review, and merge locally

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

git fetch "https://gitlab.switch.ch/gip-renater/SWITCHwayf.git" "renater/select2-rebase"
git checkout -b "gip-renater/SWITCHwayf-renater/select2-rebase" FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout "origin/master"
git merge --no-ff "gip-renater/SWITCHwayf-renater/select2-rebase"

Step 4. Push the result of the merge to GitLab

git push origin "master"

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

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

Assignee

Assign to

None

Milestone

None

Assign milestone

Time tracking

Labels

None

Assign labels

View project labels

Reference: aai/SWITCHwayf!10

Revert this merge request

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

Revert in branch

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

Pick into branch

Switch branch

Cancel

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