Download as
Browse Code »

Commit 99e1d9d8b96050f79aecd95edd8a86e02e1e84ed

Authored by Valeriy Sizov
2 parents c4f3c54e 0fbd9ac7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #2093 from riyad/remove-sqlite 

Remove SQLite support
Showing 5 changed files with 5 additions and 50 deletions   Show diff stats
@@ -11,7 +11,6 @@ end @@ -11,7 +11,6 @@ end
11 gem "rails", "3.2.9" 11 gem "rails", "3.2.9"
12 12
13 # Supported DBs 13 # Supported DBs
14 -gem "sqlite3", group: :sqlite  
15 gem "mysql2", group: :mysql 14 gem "mysql2", group: :mysql
16 gem "pg", group: :postgres 15 gem "pg", group: :postgres
17 16
@@ -410,7 +410,6 @@ GEM @@ -410,7 +410,6 @@ GEM
410 multi_json (~> 1.0) 410 multi_json (~> 1.0)
411 rack (~> 1.0) 411 rack (~> 1.0)
412 tilt (~> 1.1, != 1.3.0) 412 tilt (~> 1.1, != 1.3.0)
413 - sqlite3 (1.3.6)  
414 stamp (0.3.0) 413 stamp (0.3.0)
415 test_after_commit (0.0.1) 414 test_after_commit (0.0.1)
416 therubyracer (0.10.2) 415 therubyracer (0.10.2)
@@ -518,7 +517,6 @@ DEPENDENCIES @@ -518,7 +517,6 @@ DEPENDENCIES
518 simplecov 517 simplecov
519 six 518 six
520 spinach-rails 519 spinach-rails
521 - sqlite3  
522 stamp 520 stamp
523 test_after_commit 521 test_after_commit
524 therubyracer 522 therubyracer
config/database.yml.sqlite
View file @c4f3c54
@@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
1 -#  
2 -# PRODUCTION  
3 -#  
4 -# SQLite version 3.x  
5 -# gem install sqlite3  
6 -#  
7 -# Ensure the SQLite 3 gem is defined in your Gemfile  
8 -# gem 'sqlite3'  
9 -production:  
10 - adapter: sqlite3  
11 - database: db/production.sqlite3  
12 - pool: 5  
13 - timeout: 5000  
14 -  
15 -#  
16 -# Development specific  
17 -#  
18 -development:  
19 - adapter: sqlite3  
20 - database: db/development.sqlite3  
21 - pool: 5  
22 - timeout: 5000  
23 -  
24 -# Warning: The database defined as "test" will be erased and  
25 -# re-generated from your development database when you run "rake".  
26 -# Do not set this db to the same as development or production.  
27 -test: &test  
28 - adapter: sqlite3  
29 - database: db/test.sqlite3  
30 - pool: 5  
31 - timeout: 5000  
doc/install/databases.md
  Diff comments   View file @99e1d9d
1 # Databases: 1 # Databases:
2 2
3 -GitLab use mysql as default database but you are free to use PostgreSQL or SQLite. 3 +GitLab use MySQL as default database but you are free to use PostgreSQL.
4 4
5 5
6 -## SQLite  
7 -  
8 - sudo apt-get install -y sqlite3 libsqlite3-dev  
9 -  
10 ## MySQL 6 ## MySQL
11 7
12 sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev 8 sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev
@@ -47,9 +43,6 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit @@ -47,9 +43,6 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit
47 43
48 #### Select the database you want to use 44 #### Select the database you want to use
49 45
50 - # SQLite  
51 - sudo -u gitlab cp config/database.yml.sqlite config/database.yml  
52 -  
53 # Mysql 46 # Mysql
54 sudo -u gitlab cp config/database.yml.mysql config/database.yml 47 sudo -u gitlab cp config/database.yml.mysql config/database.yml
55 48
@@ -61,11 +54,7 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit @@ -61,11 +54,7 @@ GitLab use mysql as default database but you are free to use PostgreSQL or SQLit
61 #### Install gems 54 #### Install gems
62 55
63 # mysql 56 # mysql
64 - sudo -u gitlab -H bundle install --without development test sqlite postgres --deployment 57 + sudo -u gitlab -H bundle install --without development test postgres --deployment
65 58
66 # or postgres 59 # or postgres
67 - sudo -u gitlab -H bundle install --without development test sqlite mysql --deployment  
68 -  
69 - # or sqlite  
70 - sudo -u gitlab -H bundle install --without development test mysql postgres --deployment  
71 - 60 + sudo -u gitlab -H bundle install --without development test mysql --deployment
doc/install/installation.md
  Diff comments   View file @99e1d9d
@@ -178,7 +178,7 @@ and ensure you have followed all of the above steps carefully. @@ -178,7 +178,7 @@ and ensure you have followed all of the above steps carefully.
178 178
179 sudo gem install charlock_holmes --version '0.6.9' 179 sudo gem install charlock_holmes --version '0.6.9'
180 sudo gem install bundler 180 sudo gem install bundler
181 - sudo -u gitlab -H bundle install --without development test sqlite postgres --deployment 181 + sudo -u gitlab -H bundle install --without development test postgres --deployment
182 182
183 #### Configure git client 183 #### Configure git client
184 184
@@ -269,7 +269,7 @@ You can login via web using admin generated with setup: @@ -269,7 +269,7 @@ You can login via web using admin generated with setup:
269 269
270 # Advanced setup tips: 270 # Advanced setup tips:
271 271
272 -_Checkout databases.md for postgres or sqlite_ 272 +_Checkout databases.md for PostgreSQL_
273 273
274 ## Customizing Resque's Redis connection 274 ## Customizing Resque's Redis connection
275 275