From 35effd954019bb84688198c11a4d90484bfb9fcd Mon Sep 17 00:00:00 2001 From: peng Date: Sat, 10 Sep 2016 17:16:26 +0800 Subject: [PATCH] move sqlite3 --- .gitignore | 18 + .idea/.generators | 8 + .idea/.name | 1 + .idea/.rakeTasks | 7 + .idea/dictionaries/PENG_mac.xml | 3 + .idea/encodings.xml | 6 + .idea/misc.xml | 54 ++ .idea/modules.xml | 8 + .idea/runConfigurations/Development__vim.xml | 27 + .idea/runConfigurations/Production__vim.xml | 27 + .idea/runConfigurations/spec__vim.xml | 25 + .idea/runConfigurations/test__vim.xml | 27 + .idea/vcs.xml | 6 + .idea/vim.iml | 200 +++++ .idea/workspace.xml | 802 +++++++++++++++++++ Gemfile | 6 +- Gemfile.lock | 2 + 17 files changed, 1224 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 .idea/.generators create mode 100644 .idea/.name create mode 100644 .idea/.rakeTasks create mode 100644 .idea/dictionaries/PENG_mac.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations/Development__vim.xml create mode 100644 .idea/runConfigurations/Production__vim.xml create mode 100644 .idea/runConfigurations/spec__vim.xml create mode 100644 .idea/runConfigurations/test__vim.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/vim.iml create mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..475fda4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore the default SQLite database. +/db/*.sqlite3 +/db/*.sqlite3-journal + +# Ignore all logfiles and tempfiles. +/log/* +!/log/.keep +/tmp +/public/system/* diff --git a/.idea/.generators b/.idea/.generators new file mode 100644 index 0000000..17d6929 --- /dev/null +++ b/.idea/.generators @@ -0,0 +1,8 @@ + + diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..7923f59 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +vim \ No newline at end of file diff --git a/.idea/.rakeTasks b/.idea/.rakeTasks new file mode 100644 index 0000000..ce68872 --- /dev/null +++ b/.idea/.rakeTasks @@ -0,0 +1,7 @@ + + diff --git a/.idea/dictionaries/PENG_mac.xml b/.idea/dictionaries/PENG_mac.xml new file mode 100644 index 0000000..ce38f38 --- /dev/null +++ b/.idea/dictionaries/PENG_mac.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..aa9ae2d --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + CSS + + + Probable bugsCSS + + + RELAX NG + + + + + CoffeeScript + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..091c36e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Development__vim.xml b/.idea/runConfigurations/Development__vim.xml new file mode 100644 index 0000000..f03f2dd --- /dev/null +++ b/.idea/runConfigurations/Development__vim.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Production__vim.xml b/.idea/runConfigurations/Production__vim.xml new file mode 100644 index 0000000..dcb3bda --- /dev/null +++ b/.idea/runConfigurations/Production__vim.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/spec__vim.xml b/.idea/runConfigurations/spec__vim.xml new file mode 100644 index 0000000..aaaedf0 --- /dev/null +++ b/.idea/runConfigurations/spec__vim.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/test__vim.xml b/.idea/runConfigurations/test__vim.xml new file mode 100644 index 0000000..3305eee --- /dev/null +++ b/.idea/runConfigurations/test__vim.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vim.iml b/.idea/vim.iml new file mode 100644 index 0000000..a03622f --- /dev/null +++ b/.idea/vim.iml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..f3690a8 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,802 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1469151659389 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Gemfile b/Gemfile index e2b8bb1..4eb680c 100644 --- a/Gemfile +++ b/Gemfile @@ -19,8 +19,6 @@ gem 'rails_admin','~> 0.8.1' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.5.2' -# Use sqlite3 as the database for Active Record -gem 'sqlite3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets @@ -51,12 +49,14 @@ gem 'sdoc', '~> 0.4.0', group: :doc group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug' + # Use sqlite3 as the database for Active Record + gem 'sqlite3' end group :development do # Access an IRB console on exception pages or by using <%= console %> in views gem 'web-console', '~> 2.0' - + gem 'pg' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' end diff --git a/Gemfile.lock b/Gemfile.lock index b46a56a..1063294 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,7 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + pg (0.18.4) pkg-config (1.1.7) rack (1.6.4) rack-pjax (0.8.0) @@ -190,6 +191,7 @@ DEPENDENCIES faker (~> 1.6.3) jbuilder (~> 2.0) jquery-rails + pg rails (= 4.2.5.2) rails_admin (~> 0.8.1) sass-rails (~> 5.0)