Permalink
Browse files

version bump 2.2.0

  • Loading branch information...
1 parent 0240999 commit d90527ccc971d9e86550625c8d76be2b8ff5a872 @bborn committed Aug 4, 2013
Showing with 14 additions and 12 deletions.
  1. +4 −2 CHANGELOG
  2. +1 −1 README.markdown
  3. +8 −8 UPGRADING.markdown
  4. +1 −1 lib/community_engine/version.rb
View
@@ -3,9 +3,11 @@
* fix photo uploading from welcome_photo page
* add back searching to users index
* swap jquery for prototype
+* Upgrade to bcrybt crypto method
+=2.2.0
+* Upgrade omniauth to 1.1
-* Upgrade to bcrybt crypto method
=2.0.0.beta4
* Replace white_list plugin with Sanitize gem (white_list.rb initizlizer format has changed)
@@ -97,4 +99,4 @@
= 0.10.7
* Updating CE to be compatible with Rails 2.1.2
-* Lots of il8n refactoring, mainly using symbol tokens instead of string for localization in views.
+* Lots of il8n refactoring, mainly using symbol tokens instead of string for localization in views.
View
@@ -58,7 +58,7 @@ You can allow users to sign up and log in using their accounts from other social
provider :facebook, 'APP_ID', 'APP_SECRET'
provider :linked_in, 'CONSUMER_KEY', 'CONSUMER_SECRET'
end
- u
+
You must also add the corresponding provider gem, for example to use facebook login you will need to add
gem 'omniauth-facebook'
View
@@ -44,7 +44,7 @@ Make sure you have the following in your `environment.rb`:
config.gem 'authlogic'
config.gem 'icalendar'
config.gem 'calendar_date_select'
-
+
Run `rake db:migrate`
That's it!
@@ -53,7 +53,7 @@ That's it!
Upgrading v1.0.2
================
-Beginning with CE v.1.0.2, we have started using the Desert gem instead of the Engines plugin. Desert does many of the things the Engines plugin did, but also allows model code mixing. Also, in light of Engine's inclusion into Rails core, it appeared many of the features CE loves about Engines (plugin migrations, asset helpers, code mixing) were going to be dropped.
+Beginning with CE v.1.0.2, we have started using the Desert gem instead of the Engines plugin. Desert does many of the things the Engines plugin did, but also allows model code mixing. Also, in light of Engine's inclusion into Rails core, it appeared many of the features CE loves about Engines (plugin migrations, asset helpers, code mixing) were going to be dropped.
Upgrading an Engines-based CE app to use the new Desert-based CE is easy:
@@ -66,7 +66,7 @@ Upgrading an Engines-based CE app to use the new Desert-based CE is easy:
Run git rm --cached vendor/plugins/engines (no trailing slash).
Run rm -rf vendor/plugins/engines
Commit your changes
-
+
2. run `rake:rails:update` (coming from anything < Rails 2.3)
@@ -82,12 +82,12 @@ If you have old migrations from the Engines-based CE, you may experience some pr
Here's a regex that might help you in doing that:
-Find:
+Find:
(Engines|Rails)\.plugins\[\"community_engine\"\]\.migrate\(([0-9]+)\)
-
-Replace:
- migrate_plugin(:community_engine, $2)
+Replace:
+
+ migrate_plugin(:community_engine, $2)
-Also, you need to run `rake community_engine:db:migrate:upgrade_desert_plugin_migrations` before you migrate any _new_ CE migrations, to ensure your plugin migrations are listed in the correct table. Please note that you'll have to do this (carefully, and with backups) in production as well. Please post any questions to the CE Google Group.
+Also, you need to run `rake community_engine:db:migrate:upgrade_desert_plugin_migrations` before you migrate any _new_ CE migrations, to ensure your plugin migrations are listed in the correct table. Please note that you'll have to do this (carefully, and with backups) in production as well. Please post any questions to the CE Google Group.
@@ -1,7 +1,7 @@
module CommunityEngine
module Version
MAJOR = 2
- MINOR = 1
+ MINOR = 2
PATCH = 0
BUILD = nil

0 comments on commit d90527c

Please sign in to comment.