aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock7
2 files changed, 4 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 0f7bacb..949a464 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ group :assets do
gem 'uglifier'
end
-gem 'jquery-rails'
+gem 'prototype-rails'
# Use unicorn as the web server
# gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index db4640e..35a2418 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,9 +58,6 @@ GEM
highline (1.6.2)
hike (1.2.0)
i18n (0.6.0)
- jquery-rails (1.0.12)
- railties (~> 3.0)
- thor (~> 0.14)
json (1.5.3)
mail (2.3.0)
i18n (>= 0.4.0)
@@ -85,6 +82,8 @@ GEM
net-ssh (>= 1.99.1)
nokogiri (1.5.0)
polyglot (0.3.2)
+ prototype-rails (0.3.1)
+ rails (~> 3.1.0.beta1)
rack (1.3.2)
rack-cache (1.0.2)
rack (>= 0.4)
@@ -150,11 +149,11 @@ DEPENDENCIES
coffee-rails (~> 3.1.0.rc)
diff-lcs
fastercsv
- jquery-rails
json
mechanize
mysql2
nokogiri
+ prototype-rails
rails (= 3.1.0.rc5)
rspec
sass-rails (~> 3.1.0.rc)