aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock8
2 files changed, 10 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 9816d7f..ea8c8dc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-#gem 'rails', '~> 4.2'
+gem 'rails', '~> 4.2'
gem 'xmlrpc'
gem 'rake'
@@ -17,7 +17,7 @@ gem 'jbuilder', '~> 2.0'
# gem 'uglifier'
#end
-# gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2'
+gem 'prototype-rails', github: 'rails/prototype-rails', branch: '4.2'
# Use unicorn as the web server
#gem 'unicorn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8aa402f..48a2d90 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+ remote: git://github.com/rails/prototype-rails.git
+ revision: 0fed929ff48c10c3b978edd3baa983a81f404dbf
+ branch: 4.2
+ specs:
+ prototype-rails (4.0.0)
+ rails (~> 4.0)
+
GEM
remote: https://rubygems.org/
specs: