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

app/services/summernote_cleaner.rb

app/views/admin/education/diplomas/static.html.erb

...tRepositoryTest_test_incorrect_credentials_for_github.yml

...tRepositoryTest_test_incorrect_credentials_for_gitlab.yml

test/controllers/communication/extranets_controller_test.rb

test/controllers/education/academic_years_controller_test.rb

test/controllers/education/cohorts_controller_test.rb

...ollers/university/organization/imports_controller_test.rb

test/controllers/university/organizations_controller_test.rb

...lers/university/person/alumnus/imports_controller_test.rb

test/fixtures/communication/extranets.yml

test/fixtures/education/academic_years.yml

test/fixtures/education/cohorts.yml

test/fixtures/education/diplomas.yml

test/fixtures/university/organization/imports.yml

test/fixtures/university/organizations.yml

test/fixtures/university/person/alumnus/imports.yml

test/fixtures/university/person/experiences.yml

test/integration/summernote_test.rb

test/services/git_repository_test.rb