diff options
author | Adam Leonard <adamjamesleonard@gmail.com> | 2011-10-22 00:06:38 -0400 |
---|---|---|
committer | Adam Leonard <adamjamesleonard@gmail.com> | 2011-10-22 00:06:38 -0400 |
commit | 5b284f6adf4cf17ffb66b32a5afdb2f754d5ad5f (patch) | |
tree | b2c076d06895f1f3569749aa7841879bc56fa98f /config | |
parent | 86021a7dc397923afaf09d7602c34182f8064efe (diff) | |
download | gitlab-ce-5b284f6adf4cf17ffb66b32a5afdb2f754d5ad5f.tar.gz |
Add ability to Search issues
Diffstat (limited to 'config')
-rw-r--r-- | config/database.yml | 19 | ||||
-rw-r--r-- | config/routes.rb | 3 |
2 files changed, 12 insertions, 10 deletions
diff --git a/config/database.yml b/config/database.yml index 51a4dd459dc..59e1f12c528 100644 --- a/config/database.yml +++ b/config/database.yml @@ -4,8 +4,9 @@ # Ensure the SQLite 3 gem is defined in your Gemfile # gem 'sqlite3' development: - adapter: sqlite3 - database: db/development.sqlite3 + adapter: mysql2 + database: gitlab_development + username: root pool: 5 timeout: 5000 @@ -13,13 +14,11 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 + adapter: mysql2 + database: gitlab_development + username: root production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 + adatper: mysql2 + database: gitlab_test + username: root diff --git a/config/routes.rb b/config/routes.rb index 8a40a8fef89..5787922461c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -47,6 +47,9 @@ Gitlab::Application.routes.draw do collection do post :sort end + collection do + get :search + end end resources :notes, :only => [:create, :destroy] end |