Skip to content
Browse files

a number of changes and bumping the Rails version to 2.3.14

  • Loading branch information...
1 parent e75020c commit 7094d52dfb44ede9fabd4e185c400f61c0040d9b @eriksundelof committed Dec 9, 2012
Showing with 30 additions and 11 deletions.
  1. +3 −3 app/controllers/admin/incomings_controller.rb
  2. +1 −1 config/environment.rb
  3. +1 −1 config/initializers/memcache_settings.rb
  4. +1 −0 script/wordpress-importer
  5. +0 −1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited
  6. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.atom.erb
  7. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.html.erb
  8. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.js.erb
  9. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.xml.erb
  10. +0 −1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block
  11. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.atom.erb
  12. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.html.erb
  13. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.js.erb
  14. +1 −0 ...or/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.xml.erb
  15. +0 −1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types
  16. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.atom.erb
  17. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.html.erb
  18. +1 −0 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.js.erb
  19. +1 −0 ...or/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.xml.erb
  20. +0 −1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block
  21. +1 −0 ...plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.atom.erb
  22. +1 −0 ...plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.html.erb
  23. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.js.erb
  24. +1 −0 .../plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.xml.erb
  25. +0 −1 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types
  26. +1 −0 ...for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.atom.erb
  27. +1 −0 ...for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.html.erb
  28. +1 −0 ...e_for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.js.erb
  29. +1 −0 ..._for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.xml.erb
  30. +0 −1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types
  31. +1 −0 ...plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.atom.erb
  32. +1 −0 ...plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.html.erb
  33. +1 −0 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.js.erb
  34. +1 −0 .../plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.xml.erb
View
6 app/controllers/admin/incomings_controller.rb
@@ -54,7 +54,7 @@ def create
# save incoming text alert
def alert
- unless params[:message] && params[:subject] && params[:cellphone]
+ unless params[:message] && params[:subject]
render :text => "failed"
return
end
@@ -64,7 +64,7 @@ def alert
arguments[:title] = params[:subject]
arguments[:body] = params[:message]
arguments[:excerpt] = ""
- arguments[:cellphone_submitted] = true
+ arguments[:cellphone_submitted] = !params[:cellphone].blank?
arguments[:cellphone] = params[:cellphone]
# check if it is a known user...
@@ -88,7 +88,7 @@ def alert
end
end
- render :text => (post.save ? "success" : "failed")
+ render :text => (post.save ? "success:#{post_url(post,{:only_path => false})}" : "failed")
end
end
View
2 config/environment.rb
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file
# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
# Bootstrap the Rails environment, frameworks, and default configuration
require File.join(File.dirname(__FILE__), 'boot')
View
2 config/initializers/memcache_settings.rb
@@ -11,7 +11,7 @@ def self.initialize!
Object.const_set :SESSION_CACHE, Memcached::Rails.new(::MEMCACHE_SERVERS, cache_options.merge({ :namespace => ["#{SETTINGS[:cache][:name]}_sessions_", Rails.env].join }))
ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS.merge!({ 'cache' => ::SESSION_CACHE })
ActionController::Base.session_store = :mem_cache_store
- ActionController::Base.session_options[:expires] = 24.hours
+ #ActionController::Base.session_options[:expires] = 24.hours
end
end
View
1 script/wordpress-importer
@@ -24,6 +24,7 @@ if user
# import the posts...
doc = Nokogiri.XML(File.read(posts_file))
+ doc.remove_namespaces!
yp_posts = doc.xpath("//pma_xml_export/database/table").each do |c|
post = {}
View
1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited
View
1 .../plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 .../plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...or/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 ...r/plugins/response_for/spec/fixtures/views/pick_template_spec/inherited/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml
View
1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...ins/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 ...ns/response_for/spec/fixtures/views/pick_template_spec/respond_to_block/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml
View
1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...ins/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 ...ns/response_for/spec/fixtures/views/pick_template_spec/respond_to_types/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml
View
1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_block
View
1 ...response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 ...response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 .../response_for/spec/fixtures/views/pick_template_spec/response_for_block/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types
View
1 .../fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 .../fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...ec/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 ...c/fixtures/views/pick_template_spec/response_for_mix_of_block_and_types/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml
View
1 vendor/plugins/response_for/spec/fixtures/views/pick_template_spec/response_for_types
View
1 ...response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.atom.erb
@@ -0,0 +1 @@
+body of an_action.atom
View
1 ...response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.html.erb
@@ -0,0 +1 @@
+body of an_action.html
View
1 ...s/response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.js.erb
@@ -0,0 +1 @@
+body of an_action.js
View
1 .../response_for/spec/fixtures/views/pick_template_spec/response_for_types/an_action.xml.erb
@@ -0,0 +1 @@
+body of an_action.xml

0 comments on commit 7094d52

Please sign in to comment.
Something went wrong with that request. Please try again.