Merge pull request #710 from cmfcmf/squash-migrations

Squash old migrations, simplify Vagrant instructions
hpi-swt2 · Jun 5, 2018 · 5166b95 · 5166b95
2 parents 711d18e + 3465d31
commit 5166b95
Show file tree

Hide file tree

Showing 62 changed files with 136 additions and 463 deletions.
diff --git a/README.md b/README.md
@@ -45,15 +45,8 @@ Please keep in mind that this method may lead to a loss in performance, due to t
 ```
 vagrant up # bring up the VM
 vagrant ssh # login using SSH
-cd hpi-swt2
-echo "gem: --no-document" >> ~/.gemrc # disable docs for gems
 bundle install # install dependencies
-gem install pg # required for Postgres usage
-cp config/database.psql.yml config/database.yml # in case you want to use Postgres
-cp config/database.sqlite.yml config/database.yml # in case you want to use SQLite
-exit # restart the session, required step
-vagrant ssh # reconnect to the VM
-cd hpi-swt2
+rbenv rehash # reload newly installed binaries
 rails s -b 0 # start the rails server
 # the -b part is necessary since the app is running in a VM and would
 # otherwise drop the requests coming from the host OS

diff --git a/Vagrantfile b/Vagrantfile
@@ -28,5 +28,6 @@ Vagrant.configure("2") do |config|
     apt-get install -y phantomjs
     apt-get install -y imagemagick
     echo "cd hpi-swt2" >> /home/vagrant/.bashrc
+    echo "gem: --no-document" >> /home/vagrant/.gemrc # disable docs for gems
   SHELL
 end
diff --git a/app/models/application_letter.rb b/app/models/application_letter.rb
@@ -23,11 +23,6 @@
 #  index_application_letters_on_event_id  (event_id)
 #  index_application_letters_on_user_id   (user_id)
 #
-# Foreign Keys
-#
-#  fk_rails_...  (event_id => events.id)
-#  fk_rails_...  (user_id => users.id)
-#
 
 class ApplicationLetter < ActiveRecord::Base
   belongs_to :user

diff --git a/db/migrate/20161101110308_devise_create_users.rb b/db/migrate/20161101110308_devise_create_users.rb
diff --git a/db/migrate/20161102091145_add_name_to_user.rb b/db/migrate/20161102091145_add_name_to_user.rb
diff --git a/db/migrate/20161102131604_create_profiles.rb b/db/migrate/20161102131604_create_profiles.rb
diff --git a/db/migrate/20161103093520_create_workshops.rb b/db/migrate/20161103093520_create_workshops.rb
diff --git a/db/migrate/20161103101916_create_applications.rb b/db/migrate/20161103101916_create_applications.rb
diff --git a/db/migrate/20161103103151_create_requests.rb b/db/migrate/20161103103151_create_requests.rb
diff --git a/db/migrate/20161107124714_rename_applications_to_application_letters.rb b/db/migrate/20161107124714_rename_applications_to_application_letters.rb
diff --git a/db/migrate/20161107131407_make_foreign_keys_not_nullable.rb b/db/migrate/20161107131407_make_foreign_keys_not_nullable.rb
diff --git a/db/migrate/20161114195923_add_private_data_to_profile.rb b/db/migrate/20161114195923_add_private_data_to_profile.rb
diff --git a/db/migrate/20161116092838_add_role_to_users.rb b/db/migrate/20161116092838_add_role_to_users.rb
diff --git a/db/migrate/20161120123250_add_status_to_application_letter.rb b/db/migrate/20161120123250_add_status_to_application_letter.rb
diff --git a/db/migrate/20161122144126_create_application_notes.rb b/db/migrate/20161122144126_create_application_notes.rb
diff --git a/db/migrate/20161122151522_add_additional_information_to_application_letter.rb b/db/migrate/20161122151522_add_additional_information_to_application_letter.rb
diff --git a/db/migrate/20161123124500_change_workshop_to_event.rb b/db/migrate/20161123124500_change_workshop_to_event.rb
diff --git a/db/migrate/20161125123712_add_date_ranges_to_event.rb b/db/migrate/20161125123712_add_date_ranges_to_event.rb
diff --git a/db/migrate/20161125164958_create_agreement_letters.rb b/db/migrate/20161125164958_create_agreement_letters.rb
diff --git a/db/migrate/20161126113138_add_kind_to_events.rb b/db/migrate/20161126113138_add_kind_to_events.rb
diff --git a/db/migrate/20161126190339_add_draft_to_events.rb b/db/migrate/20161126190339_add_draft_to_events.rb
diff --git a/db/migrate/20161129110700_add_organizer_to_workshops.rb b/db/migrate/20161129110700_add_organizer_to_workshops.rb
diff --git a/db/migrate/20161129111916_add_knowledge_level_to_workshops.rb b/db/migrate/20161129111916_add_knowledge_level_to_workshops.rb
diff --git a/db/migrate/20161129120651_add_default_value_to_application_status.rb b/db/migrate/20161129120651_add_default_value_to_application_status.rb
diff --git a/db/migrate/20161129121741_remove_c_vand_email_from_profile.rb b/db/migrate/20161129121741_remove_c_vand_email_from_profile.rb
diff --git a/db/migrate/20161129131315_rename_tutor_to_coach.rb b/db/migrate/20161129131315_rename_tutor_to_coach.rb
diff --git a/db/migrate/20161204205355_add_application_deadline_to_events.rb b/db/migrate/20161204205355_add_application_deadline_to_events.rb
diff --git a/db/migrate/20161207094400_add_application_status_locked_to_events.rb b/db/migrate/20161207094400_add_application_status_locked_to_events.rb
diff --git a/db/migrate/20161209180054_remove_active_from_event.rb b/db/migrate/20161209180054_remove_active_from_event.rb
diff --git a/db/migrate/20161222154024_remove_name_from_users.rb b/db/migrate/20161222154024_remove_name_from_users.rb
diff --git a/db/migrate/20170104135212_add_fields_to_requests.rb b/db/migrate/20170104135212_add_fields_to_requests.rb
diff --git a/db/migrate/20170107140419_create_email_templates.rb b/db/migrate/20170107140419_create_email_templates.rb
diff --git a/db/migrate/20170108122417_add_status_to_requests.rb b/db/migrate/20170108122417_add_status_to_requests.rb
diff --git a/db/migrate/20170110132223_add_unlimited_participants_to_events.rb b/db/migrate/20170110132223_add_unlimited_participants_to_events.rb
diff --git a/db/migrate/20170111135212_rename_draft_to_published.rb b/db/migrate/20170111135212_rename_draft_to_published.rb
diff --git a/db/migrate/20170113083747_add_custom_application_fields_to_event.rb b/db/migrate/20170113083747_add_custom_application_fields_to_event.rb
diff --git a/db/migrate/20170114132153_change_address_fields.rb b/db/migrate/20170114132153_change_address_fields.rb
diff --git a/db/migrate/20170116093536_add_custom_application_fields_to_application_letters.rb b/db/migrate/20170116093536_add_custom_application_fields_to_application_letters.rb
diff --git a/db/migrate/20170118161954_rename_vegeterian_to_vegetarian.rb b/db/migrate/20170118161954_rename_vegeterian_to_vegetarian.rb