update with changes from Production branch

config/initializers/constants.rb

@@ -2,5 +2,28 @@
 # set to false to only allow updates via HTTP POST
 GET_SUPPORT = true
 
+# rate limit channel updates
+RATE_LIMIT = false
+
+# number of seconds to wait before a channel can be updated again
+RATE_LIMIT_FREQUENCY = '15'
+
+# main production server to handle all requests (can be a proxy)
+APPLICATION_IP_ADDRESS = '127.0.0.1'
+
+# domain for the API
+API_DOMAIN = 'http://127.0.0.1:3000/'
+
+# get api key from HTTP headers if this value is present
+HTTP_HEADER_API_KEY_NAME = 'THINGSPEAKAPIKEY'
+
+# Twitter api credentials
+CONSUMER_KEY = ''
+CONSUMER_SECRET = ''
+
+# reset password base url
+RESET_PASSWORD_URL = 'http://127.0.0.1:3000//users/reset_password/'
+
 # allow only these additional locales (use downcase, easier to parse)
-ALLOWED_LOCALES = ['pt-br','it']
+ALLOWED_LOCALES = ['pt-br','it']
+

config/initializers/secret_token.rb

@@ -4,4 +4,5 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Thingspeak::Application.config.secret_token = '44a84c8a4b53e95aecc92b38a267eaef3853d876968ad30f0b21023922b9dbaed1976e8a29884121e124720bfe3a13f8b1b0078f94f840866f83fc9bfbd75f73'
+Thingspeak::Application.config.secret_key_base = '8dbb2d4ce6ad0f87b886c4bf796b1f8f94268837776ae730f2fa2724ef1643e0eb3d4a814a01512e9e73902ea88d5553e367e321d44522bc802153369ebe4cf9'
+

config/initializers/timestamp_json_override.rb

@@ -0,0 +1,11 @@
+#Changing the as_json method to remove the milliseconds from TimeWithZone to_json result (just like in Rails 3)
+class ActiveSupport::TimeWithZone
+  def as_json(options = {})
+    if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+      xmlschema
+    else
+      %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
+    end
+  end
+end
+