lab2

2a07f9fc · April Guian · 2eed9cde · 2a07f9fc · 2a07f9fc · 2a07f9fc
Commit 2a07f9fc authored Jul 01, 2016 by April Guian
66 changed files
--- a/Lab2/.gitignore
+++ b/Lab2/.gitignore
--- a/Lab2/Gemfile
+++ b/Lab2/Gemfile
--- a/Lab2/Gemfile.lock
+++ b/Lab2/Gemfile.lock
--- a/Lab2/README.rdoc
+++ b/Lab2/README.rdoc
--- a/Lab2/Rakefile
+++ b/Lab2/Rakefile
--- a/Lab2/app/assets/images/.keep
+++ b/Lab2/app/assets/images/.keep
--- a/Lab2/app/assets/javascripts/application.js
+++ b/Lab2/app/assets/javascripts/application.js
--- a/Lab2/app/assets/stylesheets/application.css
+++ b/Lab2/app/assets/stylesheets/application.css
--- a/Lab2/app/assets/stylesheets/pbb.png
+++ b/Lab2/app/assets/stylesheets/pbb.png
--- a/Lab2/app/controllers/application_controller.rb
+++ b/Lab2/app/controllers/application_controller.rb
--- a/Lab2/app/controllers/concerns/.keep
+++ b/Lab2/app/controllers/concerns/.keep
--- a/Lab2/app/controllers/housemates_controller.rb
+++ b/Lab2/app/controllers/housemates_controller.rb
--- a/Lab2/app/controllers/pages_controller.rb
+++ b/Lab2/app/controllers/pages_controller.rb
--- a/Lab2/app/helpers/application_helper.rb
+++ b/Lab2/app/helpers/application_helper.rb
--- a/Lab2/app/mailers/.keep
+++ b/Lab2/app/mailers/.keep
--- a/Lab2/app/models/.keep
+++ b/Lab2/app/models/.keep
--- a/Lab2/app/models/concerns/.keep
+++ b/Lab2/app/models/concerns/.keep
--- a/Lab2/app/models/housemate.rb
+++ b/Lab2/app/models/housemate.rb
--- a/Lab2/app/views/housemates/index.html.erb
+++ b/Lab2/app/views/housemates/index.html.erb
--- a/Lab2/app/views/layouts/application.html.erb
+++ b/Lab2/app/views/layouts/application.html.erb
--- a/Lab2/app/views/pages/index.html.erb
+++ b/Lab2/app/views/pages/index.html.erb
--- a/Lab2/bin/bundle
+++ b/Lab2/bin/bundle
--- a/Lab2/bin/rails
+++ b/Lab2/bin/rails
--- a/Lab2/bin/rake
+++ b/Lab2/bin/rake
--- a/Lab2/bin/setup
+++ b/Lab2/bin/setup
--- a/Lab2/config.ru
+++ b/Lab2/config.ru
--- a/Lab2/config/application.rb
+++ b/Lab2/config/application.rb
--- a/Lab2/config/boot.rb
+++ b/Lab2/config/boot.rb
--- a/Lab2/config/database.yml
+++ b/Lab2/config/database.yml
--- a/Lab2/config/environment.rb
+++ b/Lab2/config/environment.rb
--- a/Lab2/config/environments/development.rb
+++ b/Lab2/config/environments/development.rb
--- a/Lab2/config/environments/production.rb
+++ b/Lab2/config/environments/production.rb
--- a/Lab2/config/environments/test.rb
+++ b/Lab2/config/environments/test.rb
--- a/Lab2/config/initializers/assets.rb
+++ b/Lab2/config/initializers/assets.rb
--- a/Lab2/config/initializers/backtrace_silencers.rb
+++ b/Lab2/config/initializers/backtrace_silencers.rb
--- a/Lab2/config/initializers/cookies_serializer.rb
+++ b/Lab2/config/initializers/cookies_serializer.rb
--- a/Lab2/config/initializers/filter_parameter_logging.rb
+++ b/Lab2/config/initializers/filter_parameter_logging.rb
--- a/Lab2/config/initializers/inflections.rb
+++ b/Lab2/config/initializers/inflections.rb
--- a/Lab2/config/initializers/mime_types.rb
+++ b/Lab2/config/initializers/mime_types.rb
--- a/Lab2/config/initializers/session_store.rb
+++ b/Lab2/config/initializers/session_store.rb
--- a/Lab2/config/initializers/wrap_parameters.rb
+++ b/Lab2/config/initializers/wrap_parameters.rb
--- a/Lab2/config/locales/en.yml
+++ b/Lab2/config/locales/en.yml
--- a/Lab2/config/routes.rb
+++ b/Lab2/config/routes.rb
--- a/Lab2/config/secrets.yml
+++ b/Lab2/config/secrets.yml
--- a/Lab2/db/migrate/20160701085058_create_housemates.rb
+++ b/Lab2/db/migrate/20160701085058_create_housemates.rb
--- a/Lab2/db/schema.rb
+++ b/Lab2/db/schema.rb
--- a/Lab2/db/seeds.rb
+++ b/Lab2/db/seeds.rb
--- a/Lab2/lib/assets/.keep
+++ b/Lab2/lib/assets/.keep
--- a/Lab2/lib/tasks/.keep
+++ b/Lab2/lib/tasks/.keep
--- a/Lab2/log/.keep
+++ b/Lab2/log/.keep
--- a/Lab2/public/404.html
+++ b/Lab2/public/404.html
--- a/Lab2/public/422.html
+++ b/Lab2/public/422.html
--- a/Lab2/public/500.html
+++ b/Lab2/public/500.html
--- a/Lab2/public/favicon.ico
+++ b/Lab2/public/favicon.ico
--- a/Lab2/public/robots.txt
+++ b/Lab2/public/robots.txt
--- a/Lab2/test/controllers/.keep
+++ b/Lab2/test/controllers/.keep
--- a/Lab2/test/fixtures/.keep
+++ b/Lab2/test/fixtures/.keep
--- a/Lab2/test/fixtures/housemates.yml
+++ b/Lab2/test/fixtures/housemates.yml
--- a/Lab2/test/helpers/.keep
+++ b/Lab2/test/helpers/.keep
--- a/Lab2/test/integration/.keep
+++ b/Lab2/test/integration/.keep
--- a/Lab2/test/mailers/.keep
+++ b/Lab2/test/mailers/.keep
--- a/Lab2/test/models/.keep
+++ b/Lab2/test/models/.keep
--- a/Lab2/test/models/housemate_test.rb
+++ b/Lab2/test/models/housemate_test.rb
--- a/Lab2/test/test_helper.rb
+++ b/Lab2/test/test_helper.rb
--- a/Lab2/vendor/assets/javascripts/.keep
+++ b/Lab2/vendor/assets/javascripts/.keep
--- a/Lab2/vendor/assets/stylesheets/.keep
+++ b/Lab2/vendor/assets/stylesheets/.keep