Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

Commit

Permalink
update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
bborn committed Mar 12, 2014
1 parent 7a82589 commit 8adce63
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 16 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* Merged in the jquery-bootstrap branch
* Removed old prototype.js code


=3.0.0.pre2 -- Polar Humenn 20 Sep 2013
* Upgraded to tinyMCE 4.0.2 ; made fix to mce_options to make it work.
* Removed curblyadvimage from tinymce plugins (not working)
Expand Down Expand Up @@ -37,6 +36,10 @@
gem actionpack-page_caching
gem rails-observers

=2.3.1
* Remove automatic loading of omniauth middleware, in favor of letting users load it themselves as specified in the README (this was causing bugs with duplicate inits of omniauth-facebook middleware)


=2.3.0
* Upgrade omniauth to 1.1

Expand Down
21 changes: 6 additions & 15 deletions lib/community_engine/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ class Engine < Rails::Engine

initializer engine_name do |app|
require root.join('config','application_config.rb')
require app.root.join('config','application_config.rb')
require app.root.join('config','application_config.rb')
end
initializer "#{engine_name}.initializers", :before => :load_config_initializers do
Dir["#{root}/config/initializers/**/*.rb"].each do |initializer|

initializer "#{engine_name}.initializers", :before => :load_config_initializers do
Dir["#{root}/config/initializers/**/*.rb"].each do |initializer|
load(initializer) unless File.exists?("#{root.to_s}/config/initializers/#{File.basename(initializer)}")
end
end
end

initializer "#{engine_name}.rails4", :after => "active_record.observer" do
Expand All @@ -38,16 +38,7 @@ class Engine < Rails::Engine
app.config.rakismet.url = configatron.app_host
end
end

initializer "#{engine_name}.load_middleware", :after => :load_config_initializers do
if !configatron.auth_providers.nil?
configatron.protect(:auth_providers)
configatron.auth_providers.to_hash.each do |name, hash|
provider = "::OmniAuth::Strategies::#{name.to_s.classify}".constantize
config.app_middleware.use provider, hash[:key], hash[:secret]
end
end
end

end
end

0 comments on commit 8adce63

Please sign in to comment.