Merge remote-tracking branch 'origin/master' into exercise-anomaly-detection

# Conflicts:
#	Capfile
#	Gemfile.lock
#	db/schema.rb

db/migrate/20180130101645_add_submission_to_structured_errors.rb

@@ -0,0 +1,5 @@
+class AddSubmissionToStructuredErrors < ActiveRecord::Migration
+  def change
+    add_reference :structured_errors, :submission, index: true
+  end
+end

db/migrate/20180130172021_add_reached_full_score_to_request_for_comment.rb

@@ -0,0 +1,15 @@
+class AddReachedFullScoreToRequestForComment < ActiveRecord::Migration
+  def up
+    add_column :request_for_comments, :full_score_reached, :boolean, default: false
+    RequestForComment.find_each { |rfc|
+      if rfc.submission.present? and rfc.submission.exercise.has_user_solved(rfc.user)
+        rfc.full_score_reached = true
+        rfc.save
+      end
+    }
+  end
+
+  def down
+    remove_column :request_for_comments, :full_score_reached
+  end
+end

db/migrate/20180202132034_add_times_featured_to_request_for_comments.rb

@@ -0,0 +1,5 @@
+class AddTimesFeaturedToRequestForComments < ActiveRecord::Migration
+  def change
+    add_column :request_for_comments, :times_featured, :integer, default: 0
+  end
+end

db/migrate/20180222145909_fix_timestamps_on_feedback.rb

@@ -0,0 +1,10 @@
+class FixTimestampsOnFeedback < ActiveRecord::Migration
+  def up
+    change_column_default(:user_exercise_feedbacks, :created_at, nil)
+    change_column_default(:user_exercise_feedbacks, :updated_at, nil)
+  end
+
+  def down
+    
+  end
+end