Skip to content

Commit

Permalink
#18 Change default database of development to Sqlite3
Browse files Browse the repository at this point in the history
  • Loading branch information
marjinal1st committed Sep 5, 2013
1 parent 17bd9d4 commit c338d33
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 6 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,29 @@
#### [Current]

####
* [f07214a](../../commit/f07214a) [#21](../../issues/21) error class changed __(Muhammet DİLEK)__
* [52318cd](../../commit/52318cd) [#19](../../issues/19) Fix README.md markdown of Gemnasium __(Ahmet Sezgin Duran)__
* [664c51a](../../commit/664c51a) [#19](../../issues/19) Add README.md markdowns for Code Climate and Gemnasium __(Ahmet Sezgin Duran)__
* [d62da34](../../commit/d62da34) [#21](../../issues/21) file changed __(Muhammet DİLEK)__
* [fe16c6e](../../commit/fe16c6e) [#16](../../issues/16) application layout changed __(Muhammet DİLEK)__
* [e28bc55](../../commit/e28bc55) [#21](../../issues/21) Simple form improved for bootstrap 3 __(Muhammet DİLEK)__
* [eff7256](../../commit/eff7256) [#19](../../issues/19) Add configuration file for Travis CI __(Ahmet Sezgin Duran)__
* [7c7fa5b](../../commit/7c7fa5b) [#16](../../issues/16) form page added __(Muhammet DİLEK)__
* [aca6f8b](../../commit/aca6f8b) [#16](../../issues/16) tables page added __(Muhammet DİLEK)__
* [0008243](../../commit/0008243) [#16](../../issues/16) view helper moved to application helper __(Muhammet DİLEK)__
* [b39c20a](../../commit/b39c20a) [#16](../../issues/16) hq namespace base layout added __(Muhammet DİLEK)__
* [f954448](../../commit/f954448) [#16](../../issues/16) login layout added __(Muhammet DİLEK)__
* [51e9f1f](../../commit/51e9f1f) [#16](../../issues/16) partials added __(Muhammet DİLEK)__
* [a9663dc](../../commit/a9663dc) [#9](../../issues/9) Setup mailchimp settings __(Onur Ozgur OZKAN)__
* [740c66a](../../commit/740c66a) [#16](../../issues/16) hierapolis assets added under the vendor __(Muhammet DİLEK)__
* [a7f31ef](../../commit/a7f31ef) [#13](../../issues/13) Set staging env __(Onur Ozgur OZKAN)__
* [d24d060](../../commit/d24d060) [#16](../../issues/16) bootstrap-sass gem updated for bootstrap 3 __(Muhammet DİLEK)__
* [8183086](../../commit/8183086) [#15](../../issues/15) Set racktime out __(Onur Ozgur OZKAN)__
* [2cac814](../../commit/2cac814) [#12](../../issues/12) Set default timezone and i18n __(Onur Ozgur OZKAN)__
* [6538045](../../commit/6538045) [#14](../../issues/14) Vulnerability Note VU[#380039](../../issues/380039) __(Onur Ozgur OZKAN)__
* [777623b](../../commit/777623b) [#11](../../issues/11) Add .ruby-version file __(Onur Ozgur OZKAN)__
* [071d9d8](../../commit/071d9d8) [#10](../../issues/10) Add .editorconfig file __(Onur Ozgur OZKAN)__
* [1a7c073](../../commit/1a7c073) [#8](../../issues/8) Add VERSION.txt __(Onur Ozgur OZKAN)__
* [f404cc1](../../commit/f404cc1) [#7](../../issues/7) Add CHANGELOG.md __(Onur Ozgur OZKAN)__
* [1a31842](../../commit/1a31842) [#5](../../issues/5) project created with cybele __(Muhammet DİLEK)__
* [20f347a](../../commit/20f347a) Initial commit __(Muhammet DİLEK)__
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,5 @@ group :development, :test do
gem 'capybara', '~> 2.1.0'
gem 'shoulda-matchers', '~> 2.2.0'
gem 'factory_girl_rails', '~> 4.0'
gem 'sqlite3', '1.3.7'
end
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ GEM
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
thor (0.18.1)
thread_safe (0.1.2)
atomic
Expand Down Expand Up @@ -244,6 +245,7 @@ DEPENDENCIES
sdoc
shoulda-matchers (~> 2.2.0)
simple_form (~> 3.0.0.rc)
sqlite3 (= 1.3.7)
turbolinks (~> 1.3.0)
uglifier (>= 1.3.0)
will-paginate-i18n (~> 0.1.13)
Expand Down
8 changes: 2 additions & 6 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
development: &default
adapter: postgresql
database: yakut_development
encoding: utf8
min_messages: warning
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
host: localhost
port: 5432

test:
<<: *default
Expand Down
54 changes: 54 additions & 0 deletions db/schema.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# 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: 20130905072700) do

create_table "admins", force: true do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
end

add_index "admins", ["email"], name: "index_admins_on_email", unique: true
add_index "admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true

create_table "users", force: true do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.string "name"
t.datetime "created_at"
t.datetime "updated_at"
t.string "time_zone"
end

add_index "users", ["email"], name: "index_users_on_email", unique: true
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true

end

0 comments on commit c338d33

Please sign in to comment.