fetched files from wrong path, added missing code to quiz2

d2b7b6b2 · Nice · 3913b03b · d2b7b6b2 · d2b7b6b2 · d2b7b6b2
Commit d2b7b6b2 authored Jul 13, 2016 by Nice
141 changed files
--- a/.DS_Store
+++ b/.DS_Store
--- a/140991/.DS_Store
+++ b/140991/.DS_Store
--- a/140911/lab2/.gitignore
+++ b/140911/lab2/.gitignore
--- a/140911/lab2/Gemfile
+++ b/140911/lab2/Gemfile
--- a/140911/lab2/Gemfile.lock
+++ b/140911/lab2/Gemfile.lock
--- a/140911/lab2/README.rdoc
+++ b/140911/lab2/README.rdoc
--- a/140911/lab2/Rakefile
+++ b/140911/lab2/Rakefile
--- a/140911/lab2/app/assets/images/.keep
+++ b/140911/lab2/app/assets/images/.keep
--- a/140911/lab2/app/assets/javascripts/application.js
+++ b/140911/lab2/app/assets/javascripts/application.js
--- a/140911/lab2/app/assets/stylesheets/application.css
+++ b/140911/lab2/app/assets/stylesheets/application.css
--- a/140911/lab2/app/controllers/application_controller.rb
+++ b/140911/lab2/app/controllers/application_controller.rb
--- a/140911/lab2/app/controllers/concerns/.keep
+++ b/140911/lab2/app/controllers/concerns/.keep
--- a/140911/lab2/app/controllers/game_ranks_controller.rb
+++ b/140911/lab2/app/controllers/game_ranks_controller.rb
--- a/140911/lab2/app/helpers/application_helper.rb
+++ b/140911/lab2/app/helpers/application_helper.rb
--- a/140911/lab2/app/mailers/.keep
+++ b/140911/lab2/app/mailers/.keep
--- a/140911/lab2/app/models/.keep
+++ b/140911/lab2/app/models/.keep
--- a/140911/lab2/app/models/concerns/.keep
+++ b/140911/lab2/app/models/concerns/.keep
--- a/140911/lab2/app/models/game_rank.rb
+++ b/140911/lab2/app/models/game_rank.rb
--- a/140911/lab2/app/views/game_ranks/index.html.erb
+++ b/140911/lab2/app/views/game_ranks/index.html.erb
--- a/140911/lab2/app/views/layouts/application.html.erb
+++ b/140911/lab2/app/views/layouts/application.html.erb
--- a/140911/lab2/bin/bundle
+++ b/140911/lab2/bin/bundle
--- a/140911/lab2/bin/rails
+++ b/140911/lab2/bin/rails
--- a/140911/lab2/bin/rake
+++ b/140911/lab2/bin/rake
--- a/140911/lab2/bin/setup
+++ b/140911/lab2/bin/setup
--- a/140911/lab2/config.ru
+++ b/140911/lab2/config.ru
--- a/140911/lab2/config/application.rb
+++ b/140911/lab2/config/application.rb
--- a/140911/lab2/config/boot.rb
+++ b/140911/lab2/config/boot.rb
--- a/140911/lab2/config/database.yml
+++ b/140911/lab2/config/database.yml
--- a/140911/lab2/config/environment.rb
+++ b/140911/lab2/config/environment.rb
--- a/140911/lab2/config/environments/development.rb
+++ b/140911/lab2/config/environments/development.rb
--- a/140911/lab2/config/environments/production.rb
+++ b/140911/lab2/config/environments/production.rb
--- a/140911/lab2/config/environments/test.rb
+++ b/140911/lab2/config/environments/test.rb
--- a/140911/lab2/config/initializers/assets.rb
+++ b/140911/lab2/config/initializers/assets.rb
--- a/140911/lab2/config/initializers/backtrace_silencers.rb
+++ b/140911/lab2/config/initializers/backtrace_silencers.rb
--- a/140911/lab2/config/initializers/cookies_serializer.rb
+++ b/140911/lab2/config/initializers/cookies_serializer.rb
--- a/140911/lab2/config/initializers/filter_parameter_logging.rb
+++ b/140911/lab2/config/initializers/filter_parameter_logging.rb
--- a/140911/lab2/config/initializers/inflections.rb
+++ b/140911/lab2/config/initializers/inflections.rb
--- a/140911/lab2/config/initializers/mime_types.rb
+++ b/140911/lab2/config/initializers/mime_types.rb
--- a/140911/lab2/config/initializers/session_store.rb
+++ b/140911/lab2/config/initializers/session_store.rb
--- a/140911/lab2/config/initializers/wrap_parameters.rb
+++ b/140911/lab2/config/initializers/wrap_parameters.rb
--- a/140911/lab2/config/locales/en.yml
+++ b/140911/lab2/config/locales/en.yml
--- a/140911/lab2/config/routes.rb
+++ b/140911/lab2/config/routes.rb
--- a/140911/lab2/config/secrets.yml
+++ b/140911/lab2/config/secrets.yml
--- a/140911/lab2/db/migrate/20160624045722_create_game_ranks.rb
+++ b/140911/lab2/db/migrate/20160624045722_create_game_ranks.rb
--- a/140911/lab2/db/schema.rb
+++ b/140911/lab2/db/schema.rb
--- a/140911/lab2/db/seeds.rb
+++ b/140911/lab2/db/seeds.rb
--- a/140911/lab2/lib/assets/.keep
+++ b/140911/lab2/lib/assets/.keep
--- a/140911/lab2/lib/tasks/.keep
+++ b/140911/lab2/lib/tasks/.keep
--- a/140911/lab2/log/.keep
+++ b/140911/lab2/log/.keep
--- a/140911/lab2/public/404.html
+++ b/140911/lab2/public/404.html
--- a/140911/lab2/public/422.html
+++ b/140911/lab2/public/422.html
--- a/140911/lab2/public/500.html
+++ b/140911/lab2/public/500.html
--- a/140911/lab2/public/favicon.ico
+++ b/140911/lab2/public/favicon.ico
--- a/140911/lab2/public/robots.txt
+++ b/140911/lab2/public/robots.txt
--- a/140911/lab2/test/controllers/.keep
+++ b/140911/lab2/test/controllers/.keep
--- a/140911/lab2/test/fixtures/.keep
+++ b/140911/lab2/test/fixtures/.keep
--- a/140911/lab2/test/fixtures/game_ranks.yml
+++ b/140911/lab2/test/fixtures/game_ranks.yml
--- a/140911/lab2/test/helpers/.keep
+++ b/140911/lab2/test/helpers/.keep
--- a/140911/lab2/test/integration/.keep
+++ b/140911/lab2/test/integration/.keep
--- a/140911/lab2/test/mailers/.keep
+++ b/140911/lab2/test/mailers/.keep
--- a/140911/lab2/test/models/.keep
+++ b/140911/lab2/test/models/.keep
--- a/140911/lab2/test/models/game_rank_test.rb
+++ b/140911/lab2/test/models/game_rank_test.rb
--- a/140911/lab2/test/test_helper.rb
+++ b/140911/lab2/test/test_helper.rb
--- a/140911/lab2/vendor/assets/javascripts/.keep
+++ b/140911/lab2/vendor/assets/javascripts/.keep
--- a/140911/lab2/vendor/assets/stylesheets/.keep
+++ b/140911/lab2/vendor/assets/stylesheets/.keep
--- a/140911/quiz2-blog-crudadmin/blog/.gitignore
+++ b/140911/quiz2-blog-crudadmin/blog/.gitignore
--- a/140911/quiz2-blog-crudadmin/blog/Gemfile
+++ b/140911/quiz2-blog-crudadmin/blog/Gemfile
--- a/140911/quiz2-blog-crudadmin/blog/Gemfile.lock
+++ b/140911/quiz2-blog-crudadmin/blog/Gemfile.lock
--- a/140911/quiz2-blog-crudadmin/blog/README.rdoc
+++ b/140911/quiz2-blog-crudadmin/blog/README.rdoc
--- a/140911/quiz2-blog-crudadmin/blog/Rakefile
+++ b/140911/quiz2-blog-crudadmin/blog/Rakefile
--- a/140911/quiz2-blog-crudadmin/blog/app/assets/images/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/app/assets/images/.keep
--- a/140911/quiz2-blog-crudadmin/blog/app/assets/javascripts/application.js
+++ b/140911/quiz2-blog-crudadmin/blog/app/assets/javascripts/application.js
--- a/140911/quiz2-blog-crudadmin/blog/app/assets/stylesheets/application.css
+++ b/140911/quiz2-blog-crudadmin/blog/app/assets/stylesheets/application.css
--- a/140911/quiz2-blog-crudadmin/blog/app/controllers/admin/posts_controller.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/controllers/admin/posts_controller.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/controllers/application_controller.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/controllers/application_controller.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/controllers/concerns/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/app/controllers/concerns/.keep
--- a/140911/quiz2-blog-crudadmin/blog/app/controllers/pages_controller.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/controllers/pages_controller.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/controllers/posts_controller.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/controllers/posts_controller.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/helpers/application_helper.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/helpers/application_helper.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/mailers/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/app/mailers/.keep
--- a/140911/quiz2-blog-crudadmin/blog/app/models/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/app/models/.keep
--- a/140911/quiz2-blog-crudadmin/blog/app/models/concerns/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/app/models/concerns/.keep
--- a/140911/quiz2-blog-crudadmin/blog/app/models/post.rb
+++ b/140911/quiz2-blog-crudadmin/blog/app/models/post.rb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/pages/index.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/pages/index.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/posts/_form.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/posts/_form.html.erb
-<%= simple_form_for(@post) do |f| %>
+<%= simple_form_for([:admin, @post]) do |f| %>
  <%= f.input :title %>
  <%= f.input :category, as: :select, collection:["Dota 2", "LoL"] %>
  <%= f.input :article %>

--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/edit.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/edit.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/index.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/index.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/new.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/new.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/show.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/show.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/layouts/application.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/layouts/application.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/pages/index.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/pages/index.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/_form.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/admin/posts/_form.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/posts/edit.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/posts/edit.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/posts/index.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/posts/index.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/posts/new.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/posts/new.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/app/views/posts/show.html.erb
+++ b/140911/quiz2-blog-crudadmin/blog/app/views/posts/show.html.erb
--- a/140911/quiz2-blog-crudadmin/blog/bin/bundle
+++ b/140911/quiz2-blog-crudadmin/blog/bin/bundle
--- a/140911/quiz2-blog-crudadmin/blog/bin/rails
+++ b/140911/quiz2-blog-crudadmin/blog/bin/rails
--- a/140911/quiz2-blog-crudadmin/blog/bin/rake
+++ b/140911/quiz2-blog-crudadmin/blog/bin/rake
--- a/140911/quiz2-blog-crudadmin/blog/bin/setup
+++ b/140911/quiz2-blog-crudadmin/blog/bin/setup
--- a/140911/quiz2-blog-crudadmin/blog/config.ru
+++ b/140911/quiz2-blog-crudadmin/blog/config.ru
--- a/140911/quiz2-blog-crudadmin/blog/config/application.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/application.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/boot.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/boot.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/database.yml
+++ b/140911/quiz2-blog-crudadmin/blog/config/database.yml
--- a/140911/quiz2-blog-crudadmin/blog/config/environment.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/environment.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/environments/development.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/environments/development.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/environments/production.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/environments/production.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/environments/test.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/environments/test.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/assets.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/assets.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/backtrace_silencers.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/backtrace_silencers.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/cookies_serializer.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/cookies_serializer.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/filter_parameter_logging.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/filter_parameter_logging.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/inflections.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/inflections.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/mime_types.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/mime_types.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/session_store.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/session_store.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/initializers/wrap_parameters.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/initializers/wrap_parameters.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/locales/en.yml
+++ b/140911/quiz2-blog-crudadmin/blog/config/locales/en.yml
--- a/140911/quiz2-blog-crudadmin/blog/config/routes.rb
+++ b/140911/quiz2-blog-crudadmin/blog/config/routes.rb
--- a/140911/quiz2-blog-crudadmin/blog/config/secrets.yml
+++ b/140911/quiz2-blog-crudadmin/blog/config/secrets.yml
--- a/140911/quiz2-blog-crudadmin/blog/db/migrate/20160712051047_create_posts.rb
+++ b/140911/quiz2-blog-crudadmin/blog/db/migrate/20160712051047_create_posts.rb
--- a/140911/quiz2-blog-crudadmin/blog/db/schema.rb
+++ b/140911/quiz2-blog-crudadmin/blog/db/schema.rb
--- a/140911/quiz2-blog-crudadmin/blog/db/seeds.rb
+++ b/140911/quiz2-blog-crudadmin/blog/db/seeds.rb
--- a/140911/quiz2-blog-crudadmin/blog/lib/assets/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/lib/assets/.keep
--- a/140911/quiz2-blog-crudadmin/blog/lib/tasks/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/lib/tasks/.keep
--- a/140911/quiz2-blog-crudadmin/blog/log/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/log/.keep
--- a/140911/quiz2-blog-crudadmin/blog/public/404.html
+++ b/140911/quiz2-blog-crudadmin/blog/public/404.html
--- a/140911/quiz2-blog-crudadmin/blog/public/422.html
+++ b/140911/quiz2-blog-crudadmin/blog/public/422.html
--- a/140911/quiz2-blog-crudadmin/blog/public/500.html
+++ b/140911/quiz2-blog-crudadmin/blog/public/500.html
--- a/140911/quiz2-blog-crudadmin/blog/public/favicon.ico
+++ b/140911/quiz2-blog-crudadmin/blog/public/favicon.ico
--- a/140911/quiz2-blog-crudadmin/blog/public/robots.txt
+++ b/140911/quiz2-blog-crudadmin/blog/public/robots.txt
--- a/140911/quiz2-blog-crudadmin/blog/test/controllers/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/controllers/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/fixtures/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/fixtures/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/fixtures/posts.yml
+++ b/140911/quiz2-blog-crudadmin/blog/test/fixtures/posts.yml
--- a/140911/quiz2-blog-crudadmin/blog/test/helpers/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/helpers/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/integration/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/integration/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/mailers/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/mailers/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/models/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/test/models/.keep
--- a/140911/quiz2-blog-crudadmin/blog/test/models/post_test.rb
+++ b/140911/quiz2-blog-crudadmin/blog/test/models/post_test.rb
--- a/140911/quiz2-blog-crudadmin/blog/test/test_helper.rb
+++ b/140911/quiz2-blog-crudadmin/blog/test/test_helper.rb
--- a/140911/quiz2-blog-crudadmin/blog/vendor/assets/javascripts/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/vendor/assets/javascripts/.keep
--- a/140911/quiz2-blog-crudadmin/blog/vendor/assets/stylesheets/.keep
+++ b/140911/quiz2-blog-crudadmin/blog/vendor/assets/stylesheets/.keep