Sebastian Serth 1a26d67c82 Merge branch 'master' into add_roles_via_LTI ...

# Conflicts:
#	app/views/application/_breadcrumbs.html.slim
#	app/views/application/welcome.html.slim
#	app/views/exercise_collections/show.html.slim
#	app/views/external_users/index.html.slim
#	app/views/layouts/application.html.slim
#	app/views/proxy_exercises/index.html.slim
#	app/views/user_exercise_feedbacks/index.html.slim
#	app/views/user_mailer/send_thank_you_note.slim

2018-12-14 00:53:06 +01:00

..

concerns

Implement support for some basic embed options for work sheets via LTI

2018-12-11 14:29:36 +01:00

controllers

Implement support for some basic embed options for work sheets via LTI

2018-12-11 14:29:36 +01:00

factories

Add user (ID and type) to proxy exercise

2018-12-06 00:31:45 +01:00

features

Merge branch 'master' into add_roles_via_LTI

2018-12-14 00:53:06 +01:00

helpers

rename factory_girl_(rails) to factory_bot_(rails)

2017-11-15 15:18:07 +01:00

lib

Completely remove old hints connected to the execution environment

2018-11-28 01:21:13 +01:00

mailers

Upgrade Rails to version 5.2.1 and adopt code & specs where necessary

2018-11-06 16:46:00 +01:00

models

Completely remove old non-structured errors and migrate existing ones.

2018-11-30 11:27:25 +01:00

policies

Fix tests and slightly refactor some policies

2018-12-12 14:09:20 +01:00

support

Update CSRF chain to prepend checks and resolve comments from PR

2018-11-06 16:46:01 +01:00

uploaders

rename factory_girl_(rails) to factory_bot_(rails)

2017-11-15 15:18:07 +01:00

views

Implement support for some basic embed options for work sheets via LTI

2018-12-11 14:29:36 +01:00

rails_helper.rb

don't use ActiveRecord fixtures

2015-02-24 09:58:48 +01:00

spec_helper.rb

updates for codeclimate

2017-11-29 09:57:27 +01:00