Merge lp://staging/~cjwatson/charms/trusty/turnip/cgit-openid into lp://staging/~canonical-launchpad-branches/charms/trusty/turnip/devel

Proposed by Colin Watson
Status: Merged
Merged at revision: 80
Proposed branch: lp://staging/~cjwatson/charms/trusty/turnip/cgit-openid
Merge into: lp://staging/~canonical-launchpad-branches/charms/trusty/turnip/devel
Diff against target: 105 lines (+32/-0)
6 files modified
config.yaml (+12/-0)
hooks/actions.py (+13/-0)
hooks/services.py (+4/-0)
templates/envs/CGIT_SECRET_PATH.j2 (+1/-0)
templates/envs/MAIN_SITE_ROOT.j2 (+1/-0)
templates/envs/OPENID_PROVIDER_ROOT.j2 (+1/-0)
To merge this branch: bzr merge lp://staging/~cjwatson/charms/trusty/turnip/cgit-openid
Reviewer Review Type Date Requested Status
William Grant (community) code Approve
Review via email: mp+259949@code.staging.launchpad.net

Commit message

Pass through the necessary configuration options for cgit OpenID authentication support.

Description of the change

Pass through the necessary configuration options for cgit OpenID authentication support.

This goes with: https://code.launchpad.net/~cjwatson/turnip/cgit-openid/+merge/259948

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: