From 79a3b5838288d38062d18a34039ec2ac17576988 Mon Sep 17 00:00:00 2001 From: lovelyzhang Date: Sun, 25 Dec 2016 18:04:20 +0800 Subject: [PATCH] zy: add gitingore --- .gitignore | 46 +++ .idea/workspace.xml | 729 ++++++++++---------------------------------- 2 files changed, 210 insertions(+), 565 deletions(-) diff --git a/.gitignore b/.gitignore index 28e6f56..4d1fbc2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,49 @@ build-iPhoneSimulator/ .rvmrc .idea/* + +*.rbc +capybara-*.html +.rspec +/log +/tmp +/db/*.sqlite3 +/db/*.sqlite3-journal +/public/system +/coverage/ +/spec/tmp +**.orig +rerun.txt +pickle-email-*.html + +# TODO Comment out this rule if you are OK with secrets being uploaded to the repo +config/initializers/secret_token.rb + +# Only include if you have production secrets in this file, which is no longer a Rails default +# config/secrets.yml + +# dotenv +# TODO Comment out this rule if environment variables can be committed +.env + +## Environment normalization: +/.bundle +/vendor/bundle + +# these should all be checked in to normalize the environment: +# Gemfile.lock, .ruby-version, .ruby-gemset + +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc + +# if using bower-rails ignore default bower_components path bower.json files +/vendor/assets/bower_components +*.bowerrc +bower.json + +# Ignore pow environment settings +.powenv + +# Ignore Byebug command history file. +.byebug_history + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f2aa764..6bf3880 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,34 +1,9 @@ - - - - - - - - - - - - - - + + - - - - - - - - - - - - - @@ -45,9 +20,6 @@ - - - @@ -56,82 +28,42 @@ - - - - - - - - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -145,10 +77,10 @@ @@ -158,18 +90,20 @@ true DEFINITION_ORDER - - - + + + + + + + + + @@ -186,8 +120,16 @@ + + + + + + - + + @@ -222,170 +168,20 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -434,50 +230,109 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - project - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + @@ -485,52 +340,42 @@ - - 1482408182630 + + 1482659541785 - - + - + - - - - - + + + + + - - + + + - - + - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +