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.

Sign up for GitHub

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

Jump to bottom

672 roles are no longer in a hierarchy #681

Merged
merged 11 commits into from
Jun 2, 2018
Merged

672 roles are no longer in a hierarchy #681

merged 11 commits into from
Jun 2, 2018

Commits on Aug 9, 2017

  1. 627 roles are no longer in a hierarchy

    @aloeser
    aloeser committed Aug 9, 2017
    Configuration menu
    Copy the full SHA
    b0f2d61 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. Merge branch 'dev' into 672_refactor_role_system

    @bjrne
    bjrne authored Aug 10, 2017
    Configuration menu
    Copy the full SHA
    6ca28ce View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2018

  1. Merge branch 'dev' into 672_refactor_role_system 

    Conflicts:
	app/models/ability.rb
    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    aff28af View commit details
    Browse the repository at this point in the history

  2. fix code climate

    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    595d5f7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into 672_refactor_role_system

    @ekrebs5
    ekrebs5 authored Jun 2, 2018
    Configuration menu
    Copy the full SHA
    265dc77 View commit details
    Browse the repository at this point in the history

  4. make requested changes

    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    9ebbecc View commit details
    Browse the repository at this point in the history

  5. Merge branch '672_refactor_role_system' of github.com:hpi-swt2/worksh… 

    …op-portal into 672_refactor_role_system
    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    80742fa View commit details
    Browse the repository at this point in the history

  6. Merge branch 'dev' into 672_refactor_role_system

    @ekrebs5
    ekrebs5 authored Jun 2, 2018
    Configuration menu
    Copy the full SHA
    7aed1a5 View commit details
    Browse the repository at this point in the history

  7. Update user.rb

    @ekrebs5
    ekrebs5 authored Jun 2, 2018
    Configuration menu
    Copy the full SHA
    9387d0b View commit details
    Browse the repository at this point in the history

  8. requested changes

    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    54eb1b3 View commit details
    Browse the repository at this point in the history

  9. Merge branch '672_refactor_role_system' of github.com:hpi-swt2/worksh… 

    …op-portal into 672_refactor_role_system
    @aloeser
    aloeser committed Jun 2, 2018
    Configuration menu
    Copy the full SHA
    fc8a52c View commit details
    Browse the repository at this point in the history