Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ad auth #29

Merged
merged 11 commits into from
Nov 25, 2014
Merged

Ad auth #29

merged 11 commits into from
Nov 25, 2014

Commits on Nov 24, 2014

  1. fix missing double quote

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    5699162 View commit details
    Browse the repository at this point in the history
  2. fix missing trailing slash

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    5d8f032 View commit details
    Browse the repository at this point in the history
  3. change merge function to deep_merge in order to merge user input into…

    … the nested hash rather than replace the entire key
    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    17bd442 View commit details
    Browse the repository at this point in the history
  4. add logic to identify the appropriate authentication flag to set 'suf…

    …ficient' for all but the final authentication method
    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    087d22f View commit details
    Browse the repository at this point in the history
  5. change all instances of '.*' to '*' as to allow admin.aclpolicy to wo…

    …rk properly. with '.*' access to all projects is denied
    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    2667fad View commit details
    Browse the repository at this point in the history
  6. change the logic to assign authentication flags differently as ldap c…

    …omes before active_directory in the jaas-auth.conf.erb template
    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    799caa7 View commit details
    Browse the repository at this point in the history
  7. fix the elsif so it checks for the correct value

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    f923e27 View commit details
    Browse the repository at this point in the history
  8. fix variable name

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    b30495c View commit details
    Browse the repository at this point in the history
  9. Revert "fix variable name"

    This reverts commit b30495c.
    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    1754175 View commit details
    Browse the repository at this point in the history
  10. add the period back for one entry

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    d1c4085 View commit details
    Browse the repository at this point in the history
  11. Fix a change I reverted because sometimes I mess up with git

    Smith, Trevor authored and Smith, Trevor committed Nov 24, 2014
    Configuration menu
    Copy the full SHA
    c2452d4 View commit details
    Browse the repository at this point in the history