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

Switch auth system to cancan WIP #69

Merged
merged 31 commits into from
Mar 26, 2015
Merged

Switch auth system to cancan WIP #69

merged 31 commits into from
Mar 26, 2015

Commits on Mar 19, 2015

  1. Remove the_role and add cancancan as dep

    @henrikssn
    henrikssn committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    4432b07 View commit details
    Browse the repository at this point in the history

  2. Remove some mentions of TheRole

    @henrikssn
    henrikssn committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    4783ae8 View commit details
    Browse the repository at this point in the history

  3. Add cancan ability model

    @henrikssn
    henrikssn committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    111c219 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2015

  1. Remove references to the_role in code.

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    ddf8018 View commit details
    Browse the repository at this point in the history

  2. Handle access errors centrally in appcontroller.

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    f6c9b52 View commit details
    Browse the repository at this point in the history

  3. Replace current_user.moderator with can? in views

    @henrikssn
    henrikssn committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    a97af7a View commit details
    Browse the repository at this point in the history

  4. Add pry so we can debug code.

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    172e63c View commit details
    Browse the repository at this point in the history

  5. Port the news controller to cancan.

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    243f4a1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'cancan' of github.com:fsek/web into cancan

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    64be0c8 View commit details
    Browse the repository at this point in the history

  7. Cancan dynamic permission model

    @henrikssn
    henrikssn committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    ccf2593 View commit details
    Browse the repository at this point in the history

  8. Small fix use single quotes for constant string.

    @jforberg
    jforberg committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    cd1f6a6 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'master' into cancan 

    Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/views/layouts/_topbar.html.erb
    @henrikssn
    henrikssn committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    d0163da View commit details
    Browse the repository at this point in the history

  10. Merge branch 'cancan' of github.com:fsek/web into cancan

    @henrikssn
    henrikssn committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    d6d93bd View commit details
    Browse the repository at this point in the history

  11. Forgot to add some files

    @henrikssn
    henrikssn committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    b822543 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2015

  1. Site should now start properly

    @henrikssn
    henrikssn committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    7544d99 View commit details
    Browse the repository at this point in the history

  2. Regenerated binstubs

    @henrikssn
    henrikssn committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    f07c536 View commit details
    Browse the repository at this point in the history

  3. Site now kind-of works with cancan

    @henrikssn
    henrikssn committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    2ccba80 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2015

  1. Permissions model now working

    @henrikssn
    henrikssn committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    a80bc9e View commit details
    Browse the repository at this point in the history

  2. Rake tasks for generating permissions

    @henrikssn
    henrikssn committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    4bb22b5 View commit details
    Browse the repository at this point in the history

  3. Hound fixes

    @henrikssn
    henrikssn committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    17d6385 View commit details
    Browse the repository at this point in the history

  4. Factory for constant

    @henrikssn
    henrikssn committed Mar 25, 2015
    Configuration menu
    Copy the full SHA
    67953fc View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2015

  1. Fixed all tests

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    77cb3ec View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into cancan 

    Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/events_controller.rb
	app/controllers/posts_controller.rb
	app/controllers/static_pages_controller.rb
	app/views/layouts/_topbar.html.erb
	app/views/layouts/_utskottmenu.html.erb
	app/views/posts/_post.html.erb
	config/routes.rb
	db/schema.rb
    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    b93b0b2 View commit details
    Browse the repository at this point in the history

  3. Missed a merge conflict

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    b3be67d View commit details
    Browse the repository at this point in the history

  4. All tests pass, ready to merge

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    72032e4 View commit details
    Browse the repository at this point in the history

  5. Test config

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    0a4720d View commit details
    Browse the repository at this point in the history

  6. Forgot two files

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    0110d26 View commit details
    Browse the repository at this point in the history

  7. Removed some old things in seeds.rb, changed validate-syntax in Permi… 

    …ssion
    @davidwessman
    davidwessman committed Mar 26, 2015
    2 Configuration menu
    Copy the full SHA
    47eb1a5 View commit details
    Browse the repository at this point in the history

  8. Fix post edit

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    ff7ff47 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'cancan' of github.com:fsek/web into cancan

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    ff9cc73 View commit details
    Browse the repository at this point in the history

  10. Hound fixes

    @henrikssn
    henrikssn committed Mar 26, 2015
    Configuration menu
    Copy the full SHA
    ee8fdb4 View commit details
    Browse the repository at this point in the history