Skip to content
Snippets Groups Projects
Commit 23c543ae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge pull request #75 from razielgn/master

Postgres support
parents 30bd6637 b2d0e25c
No related branches found
No related tags found
No related merge requests found
env:
- DB=mysql
- DB=postgresql
branches:
only:
- 'master'
Loading
Loading
@@ -7,6 +8,7 @@ rvm:
- 1.9.3
services:
- mysql
- postgresql
before_script:
- "cp config/database.yml.$DB config/database.yml"
- "bundle exec rake db:create"
Loading
Loading
Loading
Loading
@@ -11,7 +11,8 @@ end
gem 'rails', '3.2.8'
 
# DB
gem 'mysql2'
gem 'mysql2', group: :mysql
gem 'pg', group: :postgres
 
# Settings
gem 'settingslogic'
Loading
Loading
Loading
Loading
@@ -116,6 +116,7 @@ GEM
mysql2 (0.3.11)
nokogiri (1.5.5)
orm_adapter (0.4.0)
pg (0.14.1)
polyglot (0.3.3)
posix-spawn (0.3.6)
pry (0.9.10)
Loading
Loading
@@ -255,6 +256,7 @@ DEPENDENCIES
haml-rails
jquery-rails
mysql2
pg
pry
quiet_assets
rails (= 3.2.8)
Loading
Loading
#
# PRODUCTION
#
production:
adapter: postgresql
encoding: unicode
database: gitlab_ci_production
pool: 5
username: postgres
password:
# host: localhost
# port: 5432
# socket: /tmp/postgresql.sock
#
# Development specific
#
development:
adapter: postgresql
encoding: unicode
database: gitlab_ci_development
pool: 5
username: postgres
password:
# socket: /tmp/postgresql.sock
# 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: &test
adapter: postgresql
encoding: unicode
database: gitlab_ci_test
pool: 5
username: postgres
password:
# socket: /tmp/postgresql.sock
Loading
Loading
@@ -18,7 +18,7 @@ ActiveRecord::Schema.define(:version => 20130129121754) do
t.string "ref"
t.string "status"
t.datetime "finished_at"
t.text "trace", :limit => 2147483647
t.text "trace"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "sha"
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment