From 75dc160992a2b34f76eca36c18a2a41251e1f860 Mon Sep 17 00:00:00 2001 From: Rick Carlino Date: Mon, 9 Mar 2015 05:38:13 -0500 Subject: [PATCH] Forgot to change application name in Rakefile; re-running CI --- Gemfile | 1 - Gemfile.lock | 3 --- Rakefile | 2 +- app/controllers/api/sequences_controller.rb | 3 ++- app/serializers/not_device_serializer.rb | 3 --- config/application.rb | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 app/serializers/not_device_serializer.rb diff --git a/Gemfile b/Gemfile index 4785dfef3..8f66af820 100755 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,6 @@ gem 'font-awesome-rails' gem 'uglifier' gem 'high_voltage', '~> 2.1.0' gem 'haml' -gem 'figaro' # Store secrets the 12 factor way. TODO: Get off of this gem. gem 'devise', github: 'plataformatec/devise' gem 'mutations' gem 'active_model_serializers', '~> 0.8.3' diff --git a/Gemfile.lock b/Gemfile.lock index c134eb4cf..d3a056e01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,8 +124,6 @@ GEM faker (1.4.3) i18n (~> 0.5) fattr (2.2.2) - figaro (1.1.0) - thor (~> 0.14) flay (2.6.1) ruby_parser (~> 3.0) sexp_processor (~> 4.0) @@ -345,7 +343,6 @@ DEPENDENCIES devise! factory_girl_rails faker - figaro font-awesome-rails haml high_voltage (~> 2.1.0) diff --git a/Rakefile b/Rakefile index 158d8e5e5..2dfdb818a 100755 --- a/Rakefile +++ b/Rakefile @@ -2,4 +2,4 @@ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. require File.expand_path('../config/application', __FILE__) -Dss::Application.load_tasks +FarmBot::Application.load_tasks diff --git a/app/controllers/api/sequences_controller.rb b/app/controllers/api/sequences_controller.rb index 3eed72afb..26c3859b0 100644 --- a/app/controllers/api/sequences_controller.rb +++ b/app/controllers/api/sequences_controller.rb @@ -22,7 +22,8 @@ module Api end def destroy - # TODO: If you touch this again, add a mutation. + # HEY YOU!! If you touch this again, add a mutation. This is the most + # complexity I would like to see in one controlelr action. if (sequence.user == current_user) && sequence.destroy render nothing: true else diff --git a/app/serializers/not_device_serializer.rb b/app/serializers/not_device_serializer.rb deleted file mode 100644 index d22eaa667..000000000 --- a/app/serializers/not_device_serializer.rb +++ /dev/null @@ -1,3 +0,0 @@ -class DeviceSerializer < ActiveModel::Serializer - attributes :_id, :name, :uuid, :token -end diff --git a/config/application.rb b/config/application.rb index ccea7d960..a1f0ddccb 100755 --- a/config/application.rb +++ b/config/application.rb @@ -11,7 +11,6 @@ require "sprockets/railtie" # you've limited to :test, :development, or :production. Bundler.require(:default, Rails.env) -# TODO: Rename this to Farmbot. module FarmBot class Application < Rails::Application # Settings in config/environments/* take precedence over those specified