From ca032b659bf83c342533f80139fbc8b31d265424 Mon Sep 17 00:00:00 2001
From: xianbo <senluowanxiangt@163.com>
Date: Mon, 21 Apr 2014 20:21:36 +0800
Subject: [PATCH] fix

---
 .gitignore   |   3 +-
 Gemfile.lock | 111 ---------------------------------------------------
 2 files changed, 2 insertions(+), 112 deletions(-)
 delete mode 100644 Gemfile.lock

diff --git a/.gitignore b/.gitignore
index cf96fa998..6ba93364d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@
 /public/images/avatars/*
 /Gemfile
 /Gemfile.lock
-/db/schema.da
+/db/schema.rb
+
diff --git a/Gemfile.lock b/Gemfile.lock
deleted file mode 100644
index d60847b17..000000000
--- a/Gemfile.lock
+++ /dev/null
@@ -1,111 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    acts-as-taggable-on (2.4.1)
-      rails (>= 3, < 5)
-    arel (3.0.2)
-    builder (3.0.0)
-    coderay (1.0.9)
-    erubis (2.7.0)
-    fastercsv (1.5.0)
-    hike (1.2.3)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.0.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    json (1.8.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.7.6)
-    mysql2 (0.3.11-x86-mingw32)
-    net-ldap (0.3.1)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    ruby-openid (2.1.8)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    thor (0.18.1)
-    tilt (1.4.1)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  activerecord-jdbc-adapter (= 1.2.5)
-  activerecord-jdbcmysql-adapter
-  acts-as-taggable-on
-  builder (= 3.0.0)
-  coderay (~> 1.0.6)
-  fastercsv (~> 1.5.0)
-  i18n (~> 0.6.0)
-  jquery-rails (~> 2.0.2)
-  mysql2 (~> 0.3.11)
-  net-ldap (~> 0.3.1)
-  rack-openid
-  rails (= 3.2.13)
-  rdoc (>= 2.4.2)
-  ruby-openid (~> 2.1.4)