aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-12-04 01:56:50 -0800
committerXavier Noria <fxn@hashref.com>2011-12-04 01:56:50 -0800
commit5dfdc69ef91bf946ec55184053bdd7a167f7b9f1 (patch)
tree4c8d536f9def421834af158d0f51c107c9b5d701
parente9b6659c4ccd4272a363835274ec2e36e778dcd8 (diff)
parentac4763f5c04c57ed2c447e419ceb3950a34ae13c (diff)
downloadrails-5dfdc69ef91bf946ec55184053bdd7a167f7b9f1.tar.gz
rails-5dfdc69ef91bf946ec55184053bdd7a167f7b9f1.tar.bz2
rails-5dfdc69ef91bf946ec55184053bdd7a167f7b9f1.zip
Merge pull request #3848 from arunagw/sqlite3_bump
SQlite3 Bump
-rw-r--r--Gemfile2
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 8f228bad4c..4c20570398 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,7 +57,7 @@ platforms :ruby do
gem "nokogiri", ">= 1.4.5"
# AR
- gem "sqlite3", "~> 1.3.4"
+ gem "sqlite3", "~> 1.3.5"
group :db do
gem "pg", ">= 0.11.0"
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 0a0da0b5d3..386b3f7465 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -1,6 +1,6 @@
require 'active_record/connection_adapters/sqlite_adapter'
-gem 'sqlite3', '~> 1.3.4'
+gem 'sqlite3', '~> 1.3.5'
require 'sqlite3'
module ActiveRecord