Cleanup Gemfile and depend on relased version of friendly_id.

2 files changed, 11 insertions, 14 deletions

diff --git a/Gemfile b/Gemfile
index e873828..6ba6013 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,18 +2,17 @@ source "https://rubygems.org"
 
 gemspec
 
-git 'https://github.com/refinery/refinerycms.git' do
-  gem 'refinerycms-authentication'
-  gem 'refinerycms-dashboard'
-  gem 'refinerycms-pages'
-  gem 'refinerycms-testing', group: :test
-end
+gem 'refinerycms', github: 'refinery/refinerycms'
 gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n'
 gem 'refinerycms-settings', github: 'refinery/refinerycms-settings'
 gem 'refinerycms-acts-as-indexed', github: 'refinery/refinerycms-acts-as-indexed'
-gem 'protected_attributes'
+
 gem 'mime-types', '1.25.1'
 
+group :test do
+  gem 'refinerycms-testing', github: 'refinery/refinerycms'
+end
+
 # Database Configuration
 unless ENV['TRAVIS']
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
@@ -31,12 +30,10 @@ if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   gem 'pg', :platform => :ruby
 end
 
-group :test do
-  gem 'launchy'
-end
-group :development, :test do
-  gem 'pry'
-  gem 'pry-nav'
+# Refinery/rails should pull in the proper versions of these
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
 end
 
 # Load local gems according to Refinery developer preference.
diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec
index 00aeac2..088c549 100644
--- a/refinerycms-blog.gemspec
+++ b/refinerycms-blog.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency    'acts-as-taggable-on'
   s.add_dependency    'seo_meta',             '~> 2.0.0.rc.1'
   s.add_dependency    'rails_autolink',       '~> 1.1.3'
-  s.add_dependency    'friendly_id',          '~> 5.0.0.rc1'
+  s.add_dependency    'friendly_id',          '~> 5.0.0'
   s.add_dependency    'globalize',            '~> 4.0.0'
 end