Merge branch 'master' into feature-file-templates
Conflicts: app/views/application/_navigation.html.slim config/locales/de.yml config/locales/en.yml db/schema.rb
This commit is contained in:
@ -0,0 +1,5 @@
|
||||
class AddSolvedToRequestForComments < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :request_for_comments, :solved, :boolean
|
||||
end
|
||||
end
|
@ -0,0 +1,5 @@
|
||||
class AddSubmissionToRequestForComments < ActiveRecord::Migration
|
||||
def change
|
||||
add_reference :request_for_comments, :submission
|
||||
end
|
||||
end
|
@ -0,0 +1,5 @@
|
||||
class RemoveRequestedAtFromRequestForComments < ActiveRecord::Migration
|
||||
def change
|
||||
remove_column :request_for_comments, :requested_at
|
||||
end
|
||||
end
|
7
db/migrate/20160704143402_remove_teams.rb
Normal file
7
db/migrate/20160704143402_remove_teams.rb
Normal file
@ -0,0 +1,7 @@
|
||||
class RemoveTeams < ActiveRecord::Migration
|
||||
def change
|
||||
remove_reference :exercises, :team
|
||||
drop_table :teams
|
||||
drop_table :internal_users_teams
|
||||
end
|
||||
end
|
Reference in New Issue
Block a user