summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo k <mo@mokhan.ca>2012-10-02 07:34:07 -0600
committermo k <mo@mokhan.ca>2012-10-02 07:34:07 -0600
commit2b7ee00bf0da30a637ccc04f5b2bbc869ac903e9 (patch)
tree19a300d818b3b897fb392767a07f2e51fa800f3b
parentc642f04aff2bc40386537cdfe9caa439eb0a5783 (diff)
upgrade to ruby 1.9.3
-rw-r--r--.rvmrc2
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
3 files changed, 3 insertions, 5 deletions
diff --git a/.rvmrc b/.rvmrc
index 61ac9207..689aebd6 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1 +1 @@
-rvm use ruby-1.9.2@cakeside --create
+rvm use ruby-1.9.3@cakeside --create
diff --git a/Gemfile b/Gemfile
index 58143f57..fdd41719 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ group :development, :test do
gem 'webrat'
gem 'rspec-rails'
gem 'jasmine'
- gem 'sqlite3-ruby', :require => 'sqlite3'
+ gem 'sqlite3'
gem 'capistrano'
gem 'capistrano-ext'
gem 'rvm-capistrano'
diff --git a/Gemfile.lock b/Gemfile.lock
index 066ca280..ebfb2fa5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -253,8 +253,6 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
stringex (1.4.0)
sys-proctable (0.9.1)
thor (0.16.0)
@@ -310,6 +308,6 @@ DEPENDENCIES
rvm-capistrano
sass-rails
spork
- sqlite3-ruby
+ sqlite3
uglifier
webrat