Skip to content

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.
...
  • 5 commits
  • 18 files changed
  • 0 commit comments
  • 2 contributors
Commits on Mar 25, 2011
@ugisozols ugisozols Remove password_salt field from users table and comment out config.en…
…cryptor. Closes GH-558
eb94b62
Commits on Mar 26, 2011
@parndt parndt Modified to support Devise 1.2, no more pepper required and no longer…
… have to specify bcrypt. Updated authentication gemspec to require atleast devise 1.2 because on 1.1 these changes will be incompatible.
7bd49ac
@parndt parndt Lock devise to 1.2.x to ensure that we don't get 1.3 causing 1.2-like…
… issues.
63efe98
@parndt parndt Updated to 0.9.9.12 to handle devise issues. 9adc53d
Commits on Mar 27, 2011
@parndt parndt Automatic relock file. 0355f50
View
68 Gemfile.lock
@@ -1,47 +1,47 @@
PATH
remote: .
specs:
- refinerycms (0.9.9.11)
+ refinerycms (0.9.9.12)
bundler (~> 1.0)
- refinerycms-authentication (~> 0.9.9.11)
- refinerycms-base (~> 0.9.9.11)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-dashboard (~> 0.9.9.11)
- refinerycms-images (~> 0.9.9.11)
- refinerycms-pages (~> 0.9.9.11)
- refinerycms-resources (~> 0.9.9.11)
- refinerycms-settings (~> 0.9.9.11)
- refinerycms-authentication (0.9.9.11)
- devise (~> 1.1)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-base (0.9.9.11)
- refinerycms-core (0.9.9.11)
+ refinerycms-authentication (~> 0.9.9.12)
+ refinerycms-base (~> 0.9.9.12)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-dashboard (~> 0.9.9.12)
+ refinerycms-images (~> 0.9.9.12)
+ refinerycms-pages (~> 0.9.9.12)
+ refinerycms-resources (~> 0.9.9.12)
+ refinerycms-settings (~> 0.9.9.12)
+ refinerycms-authentication (0.9.9.12)
+ devise (~> 1.2.0)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-base (0.9.9.12)
+ refinerycms-core (0.9.9.12)
acts_as_indexed (~> 0.7)
friendly_id_globalize3 (~> 3.2.1)
globalize3 (>= 0.1.0.beta)
moretea-awesome_nested_set (~> 1.4)
rails (~> 3.0.5)
rdoc (>= 2.5.11)
- refinerycms-base (~> 0.9.9.11)
+ refinerycms-base (~> 0.9.9.12)
refinerycms-generators (~> 1.0)
- refinerycms-settings (~> 0.9.9.11)
+ refinerycms-settings (~> 0.9.9.12)
truncate_html (~> 0.5)
will_paginate (~> 3.0.pre)
- refinerycms-dashboard (0.9.9.11)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-images (0.9.9.11)
+ refinerycms-dashboard (0.9.9.12)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-images (0.9.9.12)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-pages (0.9.9.11)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-resources (0.9.9.11)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-pages (0.9.9.12)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-resources (0.9.9.12)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (~> 0.9.9.11)
- refinerycms-settings (0.9.9.11)
- refinerycms-base (~> 0.9.9.11)
- refinerycms-testing (0.9.9.11)
+ refinerycms-core (~> 0.9.9.12)
+ refinerycms-settings (0.9.9.12)
+ refinerycms-base (~> 0.9.9.12)
+ refinerycms-testing (0.9.9.12)
autotest
autotest-notification
autotest-rails
@@ -54,7 +54,7 @@ PATH
json_pure
launchy
rack-test (~> 0.5.6)
- refinerycms-core (~> 0.9.9.11)
+ refinerycms-core (~> 0.9.9.12)
rspec-rails (~> 2.5)
GEM
@@ -96,7 +96,7 @@ GEM
autotest (~> 4.3)
autotest-rails (4.1.0)
ZenTest
- babosa (0.2.2)
+ babosa (0.3.0)
bcrypt-ruby (2.1.4)
builder (2.1.2)
capybara (0.4.1.2)
@@ -124,9 +124,10 @@ GEM
rack-test (>= 0.5.7)
culerity (0.2.15)
database_cleaner (0.6.6)
- devise (1.1.8)
+ devise (1.2.0)
bcrypt-ruby (~> 2.1.2)
- warden (~> 1.0.2)
+ orm_adapter (~> 0.0.3)
+ warden (~> 1.0.3)
diff-lcs (1.1.2)
dragonfly (0.8.2)
rack
@@ -135,8 +136,8 @@ GEM
factory_girl (1.3.3)
ffi (1.0.7)
rake (>= 0.8.7)
- friendly_id_globalize3 (3.2.1)
- babosa (~> 0.2.1)
+ friendly_id_globalize3 (3.2.1.1)
+ babosa (~> 0.3.0)
gherkin (2.3.5)
json (>= 1.4.6)
globalize3 (0.1.0.beta)
@@ -157,6 +158,7 @@ GEM
moretea-awesome_nested_set (1.4.3.1)
activerecord (~> 3.0.0)
nokogiri (1.4.4)
+ orm_adapter (0.0.4)
polyglot (0.3.1)
rack (1.2.2)
rack-cache (1.0)
View
9 authentication/db/migrate/20110325213325_remove_password_salt_from_users.rb
@@ -0,0 +1,9 @@
+class RemovePasswordSaltFromUsers < ActiveRecord::Migration
+ def self.up
+ remove_column :users, :password_salt
+ end
+
+ def self.down
+ add_column :users, :password_salt, :string
+ end
+end
View
2 authentication/lib/gemspec.rb
@@ -20,7 +20,7 @@
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
- s.add_dependency 'devise', '~> 1.1'
+ s.add_dependency 'devise', '~> 1.2.0'
s.files = [
'#{%w( **/{*,.rspec,.gitignore,.yardopts} ).map { |file| Pathname.glob(gempath.join(file)) }.flatten.reject{|f|
View
9 authentication/refinerycms-authentication.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-authentication}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
- s.date = %q{2011-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
- s.add_dependency 'devise', '~> 1.1'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
+ s.add_dependency 'devise', '~> 1.2.0'
s.files = [
'app',
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
'db/migrate/20100929035252_add_missing_indexes_to_roles_users.rb',
'db/migrate/20101206013505_change_to_devise_users_table.rb',
'db/migrate/20110106184757_add_remember_created_at_to_users.rb',
+ 'db/migrate/20110325213325_remove_password_salt_from_users.rb',
'features',
'features/lost_password.feature',
'features/manage_users.feature',
View
2 base/lib/refinery/version.rb
@@ -3,7 +3,7 @@ class Version
@major = 0
@minor = 9
@tiny = 9
- @build = 11
+ @build = 12
class << self
attr_reader :major, :minor, :tiny, :build
View
4 base/refinerycms-base.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-base}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
s.summary = %q{Base engine for Refinery CMS}
s.description = %q{The basic base for Refinery CMS Refinery CMS}
- s.date = %q{2011-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
View
6 changelog.md
@@ -1,4 +1,8 @@
-## 0.9.9.11 [unreleased]
+## 0.9.9.12 [27 March 2011]
+* Removed `password_salt` field from users table and comment out `config.encryptor` in `config/initializers/devise.rb` to handle update to devise 1.2.0. [Uģis Ozols](https://github.com/ugisozols)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.11...0.9.9.12)
+
+## 0.9.9.11 [24 March 2011]
* Translated WYMeditor texts to Japanese. [Hiro Asari](https://github.com/BanzaiMan)
* Supporting `cucumber-rails 0.4.0`. [Philip Arndt](https://github.com/parndt)
View
4 config/initializers/devise.rb
@@ -45,10 +45,10 @@
# from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
# you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
# (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
- config.encryptor = :bcrypt
+ # config.encryptor = :bcrypt
# Setup a pepper to generate the encrypted password.
- config.pepper = "2e20a8abdd34d729ba6d05f679e513cfea9fbb1e83c81f84b29e9e4fdbd4ee59b56a32200064082a15a72b05a4d4a6a2c3784a09c0554b3a47a67cc8333ccbc7"
+ # config.pepper = "2e20a8abdd34d729ba6d05f679e513cfea9fbb1e83c81f84b29e9e4fdbd4ee59b56a32200064082a15a72b05a4d4a6a2c3784a09c0554b3a47a67cc8333ccbc7"
# ==> Configuration for :confirmable
# The time you want to give your user to confirm his account. During this time
View
4 core/lib/generators/templates/config/initializers/devise.rb
@@ -43,10 +43,10 @@
# from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
# you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
# (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
- config.encryptor = :bcrypt
+ # config.encryptor = :bcrypt
# Setup a pepper to generate the encrypted password.
- config.pepper = "2e20a8abdd34d729ba6d05f679e513cfea9fbb1e83c81f84b29e9e4fdbd4ee59b56a32200064082a15a72b05a4d4a6a2c3784a09c0554b3a47a67cc8333ccbc7"
+ # config.pepper = "2e20a8abdd34d729ba6d05f679e513cfea9fbb1e83c81f84b29e9e4fdbd4ee59b56a32200064082a15a72b05a4d4a6a2c3784a09c0554b3a47a67cc8333ccbc7"
# ==> Configuration for :confirmable
# The time you want to give your user to confirm his account. During this time
View
8 core/refinerycms-core.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-core}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -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.11'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-settings', '~> 0.9.9.12'
s.add_dependency 'refinerycms-generators', '~> 1.0'
s.add_dependency 'acts_as_indexed', '~> 0.7'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
View
6 dashboard/refinerycms-dashboard.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-dashboard}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -71,5 +71,5 @@ Gem::Specification.new do |s|
'refinerycms-dashboard.gemspec'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
end
View
9 db/migrate/20110325213325_remove_password_salt_from_users.rb
@@ -0,0 +1,9 @@
+class RemovePasswordSaltFromUsers < ActiveRecord::Migration
+ def self.up
+ remove_column :users, :password_salt
+ end
+
+ def self.down
+ add_column :users, :password_salt, :string
+ end
+end
View
6 images/refinerycms-images.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-images}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
'spec/uploads/beach.jpeg'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 pages/refinerycms-pages.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-pages}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -114,5 +114,5 @@ Gem::Specification.new do |s|
'spec/models/page_spec.rb'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
end
View
20 refinerycms.gemspec
@@ -2,9 +2,9 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
s.add_dependency 'bundler', '~> 1.0'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-base', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-dashboard', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-images', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-pages', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-resources', '~> 0.9.9.11'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-authentication', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-dashboard', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-images', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-pages', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-resources', '~> 0.9.9.12'
+ s.add_dependency 'refinerycms-settings', '~> 0.9.9.12'
s.files = [
'.gitignore',
View
6 resources/refinerycms-resources.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-resources}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
'spec/uploads/refinery_is_awesome.txt'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 settings/refinerycms-settings.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-settings}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -83,5 +83,5 @@ Gem::Specification.new do |s|
'spec/models/refinery_setting_spec.rb'
]
- s.add_dependency 'refinerycms-base', '~> 0.9.9.11'
+ s.add_dependency 'refinerycms-base', '~> 0.9.9.12'
end
View
6 testing/refinerycms-testing.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-testing}
- s.version = %q{0.9.9.11}
+ s.version = %q{0.9.9.12}
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-03-25}
+ s.date = %q{2011-03-27}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -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.11'
+ s.add_dependency 'refinerycms-core', '~> 0.9.9.12'
# RSpec
s.add_dependency 'rspec-rails', '~> 2.5'

No commit comments for this range

Something went wrong with that request. Please try again.