Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: resolve/refinerycms
...
head fork: resolve/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 18 files changed
  • 0 commit comments
  • 1 contributor
View
58 Gemfile.lock
@@ -1,45 +1,47 @@
PATH
remote: .
specs:
- refinerycms (0.9.9.2)
+ refinerycms (0.9.9.3)
bundler (~> 1.0.10)
- refinerycms-authentication (~> 0.9.9.2)
- refinerycms-base (~> 0.9.9.2)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-dashboard (~> 0.9.9.2)
- refinerycms-images (~> 0.9.9.2)
- refinerycms-pages (~> 0.9.9.2)
- refinerycms-resources (~> 0.9.9.2)
- refinerycms-settings (~> 0.9.9.2)
- refinerycms-authentication (0.9.9.2)
+ refinerycms-authentication (~> 0.9.9.3)
+ refinerycms-base (~> 0.9.9.3)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-dashboard (~> 0.9.9.3)
+ refinerycms-images (~> 0.9.9.3)
+ refinerycms-pages (~> 0.9.9.3)
+ refinerycms-resources (~> 0.9.9.3)
+ refinerycms-settings (~> 0.9.9.3)
+ refinerycms-authentication (0.9.9.3)
devise (~> 1.1)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-base (0.9.9.2)
- refinerycms-core (0.9.9.2)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-base (0.9.9.3)
+ refinerycms-core (0.9.9.3)
acts_as_indexed (~> 0.7)
friendly_id_globalize3 (~> 3.2.0)
globalize3 (>= 0.1.0.beta)
moretea-awesome_nested_set (= 1.4.3.1)
rails (~> 3.0.3)
rdoc (>= 2.5.11)
- refinerycms-base (~> 0.9.9.2)
+ refinerycms-base (~> 0.9.9.3)
refinerycms-generators (~> 0.9.9.3)
- refinerycms-settings (~> 0.9.9.2)
+ refinerycms-settings (~> 0.9.9.3)
truncate_html (~> 0.5)
will_paginate (~> 3.0.pre)
- refinerycms-dashboard (0.9.9.2)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-images (0.9.9.2)
+ refinerycms-dashboard (0.9.9.3)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-images (0.9.9.3)
dragonfly (~> 0.8.2)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-pages (0.9.9.2)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-resources (0.9.9.2)
+ rack-cache (>= 0.5.3)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-pages (0.9.9.3)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-resources (0.9.9.3)
dragonfly (~> 0.8.2)
- refinerycms-core (~> 0.9.9.2)
- refinerycms-settings (0.9.9.2)
- refinerycms-base (~> 0.9.9.2)
- refinerycms-testing (0.9.9.2)
+ rack-cache (>= 0.5.3)
+ refinerycms-core (~> 0.9.9.3)
+ refinerycms-settings (0.9.9.3)
+ refinerycms-base (~> 0.9.9.3)
+ refinerycms-testing (0.9.9.3)
autotest
autotest-notification
autotest-rails
@@ -52,7 +54,7 @@ PATH
json_pure
launchy
rack-test (~> 0.5.6)
- refinerycms-core (~> 0.9.9.2)
+ refinerycms-core (~> 0.9.9.3)
rspec-rails (~> 2.5)
GEM
@@ -155,6 +157,8 @@ GEM
nokogiri (1.4.4)
polyglot (0.3.1)
rack (1.2.1)
+ rack-cache (1.0)
+ rack (>= 0.4)
rack-mount (0.6.13)
rack (>= 1.0.0)
rack-test (0.5.7)
View
4 authentication/refinerycms-authentication.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-authentication}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
s.date = %q{2011-02-17}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
s.add_dependency 'devise', '~> 1.1'
s.files = [
View
2  base/lib/refinery/version.rb
@@ -3,7 +3,7 @@ class Version
@major = 0
@minor = 9
@tiny = 9
- @build = 2
+ @build = 3
class << self
attr_reader :major, :minor, :tiny, :build
View
2  base/refinerycms-base.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-base}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Base engine for Refinery CMS}
s.description = %q{The basic base for Refinery CMS Refinery CMS}
s.date = %q{2011-02-17}
View
10 bin/refinerycms
@@ -347,16 +347,6 @@ module Refinery
puts "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX"
end
- puts "\n--- Refinery CMS 0.9.9.1 note ---"
- puts "New 'core' engine called 'refinerycms-testing' which handles RSpec and Cucumber support."
- puts "You will see this disabled in your Gemfile in the '# REFINERY CMS' section."
- puts "To enable it, uncomment the gem line in your Gemfile and run:"
- puts "\nbundle install"
- puts "rails generate refinerycms_testing"
- puts "\nIf it prompts you about whether you want to overwrite any files that conflict, choose yes."
- puts "\nNow, to run the specs and features you can just type 'rake'."
- puts "--- End upgrade note ---\n"
-
puts "\nThanks for installing Refinery, enjoy creating your new application!"
puts "---------\n\n"
end
View
4 changelog.md
@@ -1,3 +1,7 @@
+## 0.9.9.3 [17 February 2011]
+
+* Fixed faulty require statement that tried to load rack/cache before dragonfly. [Philip Arndt](https://github.com/parndt)
+
## 0.9.9.2 [17 February 2011]
* Removed ``activesupport`` requirement from ``bin/refinerycms``. [Philip Arndt](https://github.com/parndt)
View
6 core/refinerycms-core.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-core}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Core engine for Refinery CMS}
s.description = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
s.date = %q{2011-02-17}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-base', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-settings', '~> 0.9.9.3'
s.add_dependency 'refinerycms-generators', '~> 0.9.9.3'
s.add_dependency 'acts_as_indexed', '~> 0.7'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.0'
View
4 dashboard/refinerycms-dashboard.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-dashboard}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Dashboard engine for Refinery CMS}
s.description = %q{The dashboard is usually the first engine the user sees in the backend of Refinery CMS. It displays useful information and contains links to common functionality.}
s.date = %q{2011-02-17}
@@ -68,5 +68,5 @@ Gem::Specification.new do |s|
'refinerycms-dashboard.gemspec'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
end
View
1  images/lib/gemspec.rb
@@ -27,6 +27,7 @@
s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
s.add_dependency 'dragonfly', '~> 0.8.2'
+ s.add_dependency 'rack-cache', '>= 0.5.3'
end
EOF
View
2  images/lib/refinerycms-images.rb
@@ -1,5 +1,5 @@
-require 'rack/cache'
require 'dragonfly'
+require 'rack/cache'
require 'refinerycms-core'
module Refinery
View
5 images/refinerycms-images.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-images}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Images engine for Refinery CMS}
s.description = %q{Handles all image upload and processing functionality in Refinery CMS.}
s.date = %q{2011-02-17}
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
'spec/uploads/beach.jpeg'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
s.add_dependency 'dragonfly', '~> 0.8.2'
+ s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
4 pages/refinerycms-pages.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-pages}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Pages engine for Refinery CMS}
s.description = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
s.date = %q{2011-02-17}
@@ -106,5 +106,5 @@ Gem::Specification.new do |s|
'spec/models/page_spec.rb'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
end
View
33 refinerycms.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
s.date = %q{2011-02-17}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
s.add_dependency 'bundler', '~> 1.0.10'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-base', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-dashboard', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-images', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-pages', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-resources', '~> 0.9.9.2'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-authentication', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-dashboard', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-images', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-pages', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-resources', '~> 0.9.9.3'
+ s.add_dependency 'refinerycms-settings', '~> 0.9.9.3'
s.files = [
'.gitignore',
@@ -57,26 +57,11 @@ Gem::Specification.new do |s|
'config/environments/test.rb',
'config/settings.rb',
'config.ru',
- 'index',
- 'index/development',
- 'index/development/Page',
- 'index/development/Page/102_111_117',
- 'index/development/Page/104_111_109',
- 'index/development/Page/110_111_116',
- 'index/development/Page/112_111_108',
- 'index/development/Page/112_114_105',
- 'index/development/Page/112_97_103',
- 'index/development/Page/116_104_97',
- 'index/development/Page/121_111_117',
- 'index/development/Page/97_98_111',
- 'index/development/Page/99_111_110',
- 'index/development/Page/size',
'lib',
'lib/refinery.rb',
'lib/refinerycms.rb',
'license.md',
'license.md',
- 'public',
'readme.md',
'readme.md',
'refinerycms.gemspec',
View
1  resources/lib/gemspec.rb
@@ -27,6 +27,7 @@
s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
s.add_dependency 'dragonfly', '~> 0.8.2'
+ s.add_dependency 'rack-cache', '>= 0.5.3'
end
EOF
View
2  resources/lib/refinerycms-resources.rb
@@ -1,5 +1,5 @@
-require 'rack/cache'
require 'dragonfly'
+require 'rack/cache'
require 'refinerycms-core'
module Refinery
View
5 resources/refinerycms-resources.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-resources}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Resources engine for Refinery CMS}
s.description = %q{Handles all file upload and processing functionality in Refinery CMS.}
s.date = %q{2011-02-17}
@@ -84,6 +84,7 @@ Gem::Specification.new do |s|
'spec/uploads/refinery_is_awesome.txt'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
s.add_dependency 'dragonfly', '~> 0.8.2'
+ s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
4 settings/refinerycms-settings.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-settings}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Settings engine for Refinery CMS}
s.description = %q{The default settings engine that is required by Refinery CMS core. Adds programmer creatable, user editable settings for each engine.}
s.date = %q{2011-02-17}
@@ -80,5 +80,5 @@ Gem::Specification.new do |s|
'spec/models/refinery_setting_spec.rb'
]
- s.add_dependency 'refinerycms-base', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.3'
end
View
4 testing/refinerycms-testing.gemspec
@@ -2,7 +2,7 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-testing}
- s.version = %q{0.9.9.2}
+ s.version = %q{0.9.9.3}
s.summary = %q{Testing plugin for Refinery CMS}
s.description = %q{This plugin adds the ability to run cucumber and rspec against the RefineryCMS gem while inside a RefineryCMS project}
s.date = %q{2011-02-17}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '~> 0.9.9.2'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.3'
# RSpec
s.add_dependency 'rspec-rails', '~> 2.5'

No commit comments for this range

Something went wrong with that request. Please try again.