Merge branch 'master' of github.com:noesya/osuny

.buildpacks

Gemfile.lock

app/controllers/admin/universities_controller.rb

app/controllers/admin/users_controller.rb

app/controllers/application_controller.rb

app/controllers/server/application_controller.rb

app/controllers/users/passwords_controller.rb

...controllers/users/two_factor_authentication_controller.rb

app/mailers/devise_mailer.rb

app/models/ability.rb

app/models/user/with_roles.rb

app/views/admin/universities/_form.html.erb

app/views/admin/universities/edit.html.erb

app/views/admin/universities/index.html.erb

app/views/admin/universities/new.html.erb

app/views/admin/universities/show.html.erb

app/views/admin/users/_form.html.erb

app/views/admin/users/index.html.erb

config/admin_navigation.rb

config/initializers/warden.rb