updates from production

app/models/user.rb

@@ -38,7 +38,6 @@ class User < ActiveRecord::Base
   has_many :thinghttps, :dependent => :destroy
   has_many :tweetcontrols, :dependent => :destroy
   has_many :reacts, :dependent => :destroy
-  has_many :scheduled_thinghttps, :dependent => :destroy
   has_many :talkbacks, :dependent => :destroy
   has_many :timecontrols, :dependent => :destroy
   has_many :plugins, :dependent => :destroy

app/views/apps/index.html.erb

@@ -48,7 +48,7 @@
       <% if current_admin_user.present? %>
         <div class="apps">
           <%= link_to timecontrols_path do %>
-            <%= image_tag 'scheduled_thinghttp.png', :size => '104x104' %>
+            <%= image_tag 'timecontrol.png', :size => '104x104' %>
             <br>
             <%= t(:timecontrol) %>
           <% end %>

config/locales/en.yml

@@ -300,20 +300,7 @@ en:
   social_saved: "Submitted, thank you!"
   submit: "Submit"
   sum: "Sum"
-  scheduled_thinghttp: "Scheduled ThingHTTP"
-  scheduled_thinghttp_header_name: "name"
-  scheduled_thinghttp_new_button: "New Scheduled ThingHTTP"
-  scheduled_thinghttp_delete_confirm: "Are you sure you wish to delete this scheduled ThingHTTP?"
-  scheduled_thinghttp_label_name: "Name"
-  scheduled_thinghttp_save_button: "Save Scheduled ThingHTTP"
-  scheduled_thinghttp_create_button: "Create Scheduled ThingHTTP"
-  scheduledthinghttp_default_name: "Scheduled ThingHTTP"
-  scheduled_thinghttp_thinghttp_error: "'%{thinghttp_name}' request doesn't belong to you"
-  scheduled_thinghttp_channel_error: "'%{channel_name}' channel doesn't belong to you"
-  scheduled_thinghttp_label_rule: "Rule"
-  scheduled_thinghttp_field_error: "Not a valid field"
   support: "Support"
-  help_scheduled_thinghttp_edit: ""
   tag: "tag"
   tags: "Tags"
   tags_search: "Search Channels"

config/routes.rb

@@ -173,7 +173,6 @@ Thingspeak::Application.routes.draw do
     resources :tweetcontrol
     resources :reacts
     resources :timecontrols
-    resources :scheduled_thinghttps
   end
 
   # talkback api

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140903095213) do
+ActiveRecord::Schema.define(version: 20140923230924) do
 
   create_table "active_admin_comments", force: true do |t|
     t.string   "namespace"
@@ -271,23 +271,6 @@ ActiveRecord::Schema.define(version: 20140903095213) do
   add_index "reacts", ["run_interval"], name: "index_reacts_on_run_interval", using: :btree
   add_index "reacts", ["user_id"], name: "index_reacts_on_user_id", using: :btree
 
-  create_table "scheduled_thinghttps", force: true do |t|
-    t.integer  "user_id"
-    t.string   "name"
-    t.boolean  "activated",    default: true, null: false
-    t.integer  "run_interval"
-    t.integer  "thinghttp_id"
-    t.integer  "channel_id"
-    t.string   "field_name"
-    t.datetime "last_run_at"
-    t.string   "last_result"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "scheduled_thinghttps", ["activated", "run_interval"], name: "index_scheduled_thinghttps_on_activated_and_run_interval", using: :btree
-  add_index "scheduled_thinghttps", ["user_id"], name: "index_scheduled_thinghttps_on_user_id", using: :btree
-
   create_table "taggings", force: true do |t|
     t.integer  "tag_id"
     t.integer  "channel_id"

spec/factories/user.rb

@@ -2,13 +2,13 @@ FactoryGirl.define do
   factory :user do
     sequence(:login) {|n| "name#{n}" }
     sequence(:email) {|n| "email#{n}@example.com" }
+    sequence(:authentication_token) {|n| "token#{n}" }
     password "foobar88"
     password_confirmation {|u| u.password}
     bio ""
     website ""
     time_zone "London"
     api_key 'ED1HVHNEH2BZD0AB'
-    authentication_token '123456token'
   end
 end