Merge branch 'master' of github.com:lifo/docrails

1 files changed, 10 insertions, 10 deletions

diff --git a/Gemfile b/Gemfile
index c1486b725d..10202ca877 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,30 +3,30 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['AREL']
-  gem 'arel', :path => ENV['AREL']
+  gem 'arel', path: ENV['AREL']
 else
   gem 'arel'
 end
 
-gem 'rack-test', :git => "git://github.com/brynary/rack-test.git"
+gem 'rack-test', github: "brynary/rack-test"
 gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'jquery-rails'
 
 if ENV['JOURNEY']
-  gem 'journey', :path => ENV['JOURNEY']
+  gem 'journey', path: ENV['JOURNEY']
 else
-  gem 'journey', :git => "git://github.com/rails/journey"
+  gem 'journey', github: "rails/journey"
 end
 
 if ENV['AR_DEPRECATED_FINDERS']
   gem 'active_record_deprecated_finders', path: ENV['AR_DEPRECATED_FINDERS']
 else
-  gem 'active_record_deprecated_finders', git: 'git://github.com/rails/active_record_deprecated_finders'
+  gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
 end
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
-gem 'uglifier', '>= 1.0.3', :require => false
+gem 'uglifier', '>= 1.0.3', require: false
 
 gem 'rake', '>= 0.8.7'
 gem 'mocha', '>= 0.11.2'
@@ -36,7 +36,7 @@ group :doc do
   # to a bug, but the PR that fixes it has been there
   # for some weeks unapplied. As a temporary solution
   # this is our own fork with the fix.
-  gem 'sdoc',  :git => 'git://github.com/fxn/sdoc.git'
+  gem 'sdoc',  github: 'fxn/sdoc'
   gem 'RedCloth', '~> 4.2'
   gem 'w3c_validators'
 end
@@ -50,7 +50,7 @@ instance_eval File.read local_gemfile if File.exists? local_gemfile
 
 platforms :mri do
   group :test do
-    gem 'ruby-prof'
+    gem 'ruby-prof', '0.10.8'
   end
 end
 
@@ -90,9 +90,9 @@ if ENV['ORACLE_ENHANCED_PATH'] || ENV['ORACLE_ENHANCED']
     gem 'ruby-oci8', '>= 2.0.4'
   end
   if ENV['ORACLE_ENHANCED_PATH']
-    gem 'activerecord-oracle_enhanced-adapter', :path => ENV['ORACLE_ENHANCED_PATH']
+    gem 'activerecord-oracle_enhanced-adapter', path: ENV['ORACLE_ENHANCED_PATH']
   else
-    gem 'activerecord-oracle_enhanced-adapter', :git => 'git://github.com/rsim/oracle-enhanced.git'
+    gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced'
   end
 end