From d31ef564e5c842e27915e2744b49468d48201ffb Mon Sep 17 00:00:00 2001 From: pengfei <18435155638@163.com> Date: Fri, 2 Mar 2018 19:45:22 +0800 Subject: [PATCH] update .gitignore --- .gitignore | 2 + .idea/.generators | 8 - .idea/.rakeTasks | 7 - .idea/misc.xml | 4 - .idea/modules.xml | 8 - .idea/runConfigurations/Development__uask.xml | 28 - .idea/runConfigurations/Production__uask.xml | 28 - .idea/runConfigurations/spec__uask.xml | 26 - .idea/runConfigurations/test__uask.xml | 28 - .idea/uask.iml | 248 ---- .idea/vcs.xml | 6 - .idea/workspace.xml | 1044 ----------------- config/database.yml | 54 - db/schema.rb | 53 - 14 files changed, 2 insertions(+), 1542 deletions(-) delete mode 100644 .idea/.generators delete mode 100644 .idea/.rakeTasks delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/runConfigurations/Development__uask.xml delete mode 100644 .idea/runConfigurations/Production__uask.xml delete mode 100644 .idea/runConfigurations/spec__uask.xml delete mode 100644 .idea/runConfigurations/test__uask.xml delete mode 100644 .idea/uask.iml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml delete mode 100644 config/database.yml delete mode 100644 db/schema.rb diff --git a/.gitignore b/.gitignore index 9e22a1b..3b34a50 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ !/log/.keep /tmp /.idea/* +/config/database.yml +/db/schema.rb diff --git a/.idea/.generators b/.idea/.generators deleted file mode 100644 index 17d6929..0000000 --- a/.idea/.generators +++ /dev/null @@ -1,8 +0,0 @@ - - diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks deleted file mode 100644 index c6865d9..0000000 --- a/.idea/.rakeTasks +++ /dev/null @@ -1,7 +0,0 @@ - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3090176..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ca2418a..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Development__uask.xml b/.idea/runConfigurations/Development__uask.xml deleted file mode 100644 index 6864b4d..0000000 --- a/.idea/runConfigurations/Development__uask.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Production__uask.xml b/.idea/runConfigurations/Production__uask.xml deleted file mode 100644 index 8080c6f..0000000 --- a/.idea/runConfigurations/Production__uask.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/spec__uask.xml b/.idea/runConfigurations/spec__uask.xml deleted file mode 100644 index 4fc594a..0000000 --- a/.idea/runConfigurations/spec__uask.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/test__uask.xml b/.idea/runConfigurations/test__uask.xml deleted file mode 100644 index 42c4c7e..0000000 --- a/.idea/runConfigurations/test__uask.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uask.iml b/.idea/uask.iml deleted file mode 100644 index c71489c..0000000 --- a/.idea/uask.iml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 6564d52..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 085ac29..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1044 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - 1516600658536 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 984779e..0000000 --- a/config/database.yml +++ /dev/null @@ -1,54 +0,0 @@ -# MySQL. Versions 5.0+ are recommended. -# -# Install the MYSQL driver -# gem install mysql2 -# -# Ensure the MySQL gem is defined in your Gemfile -# gem 'mysql2' -# -# And be sure to use new-style password hashing: -# http://dev.mysql.com/doc/refman/5.0/en/old-client.html -# -default: &default - adapter: mysql2 - encoding: utf8 - pool: 5 - username: root - password: root -# socket: /var/run/mysqld/mysqld.sock - -development: - <<: *default - database: udask - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: udask - -# As with config/secrets.yml, you never want to store sensitive information, -# like your database password, in your source code. If your source code is -# ever seen by anyone, they now have access to your database. -# -# Instead, provide the password as a unix environment variable when you boot -# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full rundown on how to provide these environment variables in a -# production deployment. -# -# On Heroku and other platform providers, you may have a full connection URL -# available as an environment variable. For example: -# -# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase" -# -# You can use this database configuration with: -# -# production: -# url: <%= ENV['DATABASE_URL'] %> -# -production: - <<: *default - database: uask_production - username: udask - password: <%= ENV['UASK_DATABASE_PASSWORD'] %> diff --git a/db/schema.rb b/db/schema.rb deleted file mode 100644 index 7a4be62..0000000 --- a/db/schema.rb +++ /dev/null @@ -1,53 +0,0 @@ -# encoding: UTF-8 -# This file is auto-generated from the current state of the database. Instead -# of editing this file, please use the migrations feature of Active Record to -# incrementally modify your database, and then regenerate this schema definition. -# -# Note that this schema.rb definition is the authoritative source for your -# database schema. If you need to create the application database on another -# system, you should be using db:schema:load, not running all the migrations -# from scratch. The latter is a flawed and unsustainable approach (the more migrations -# you'll amass, the slower it'll run and the greater likelihood for issues). -# -# It's strongly recommended that you check this file into your version control system. - -ActiveRecord::Schema.define(version: 20180228104924) do - - create_table "jobs", force: :cascade do |t| - t.string "name", limit: 255 - t.text "content", limit: 65535 - t.integer "user_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "jobs", ["user_id"], name: "index_jobs_on_user_id", using: :btree - - create_table "questions", force: :cascade do |t| - t.string "name", limit: 255 - t.text "content", limit: 65535 - t.integer "user_id", limit: 4 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - end - - add_index "questions", ["user_id"], name: "index_questions_on_user_id", using: :btree - - create_table "users", force: :cascade do |t| - t.string "name", limit: 255 - t.string "email", limit: 255 - t.string "password_digest", limit: 255 - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "remember_digest", limit: 255 - t.boolean "admin", default: false - t.string "activation_digest", limit: 255 - t.boolean "activated", default: false - t.datetime "activated_at" - end - - add_index "users", ["email", "name"], name: "index_users_on_email_and_name", unique: true, using: :btree - - add_foreign_key "jobs", "users" - add_foreign_key "questions", "users" -end