lorenjohnson

MacBookPros-MacBook-Pro:goodgift loren$ git push heroku master
Counting objects: 589, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (288/288), done.
Writing objects: 100% (589/589), 228.89 KiB, done.
Total 589 (delta 280), reused 502 (delta 250)

-----> Heroku receiving push
-----> Rails app detected
-----> Detected Rails is not set to serve static_assets

lorenjohnson

class SetupController < ApplicationController
  before_filter :set_instance_and_user, :object, :objects
  respond_to :html, :js

  def index
    flash[:warning] = flash[:notice] = nil if !params[:cancel].blank?
    eval("@#{controller.controller_name.singularize} = #{controller.controller_name}")
    instance_variable_set("@#{object_name}", model_klass.new(params[object_name]))
    instance_variable_set("@#{objects_name}", model_klass.order("updated_on DESC"))
    respond_with(eval("@#{objects_name}"))

lorenjohnson

shared: &shared
  adapter: mysql2
  encoding: utf8
  reconnect: false
  pool: 5
  socket: /tmp/mysql.sock
  username: root
  password:

development:

lorenjohnson

source :gemcutter

gem 'rails', '3.0.12'
gem 'mysql2', '< 0.3'
gem 'unicorn'

gem 'jquery-rails', '>= 0.2.7'

gem 'jrails'

lorenjohnson

Beginning deployment of refs/tags/rails_3012_release_1 (ce1a3b2030fcc65874ffbdcc595b561460774145) without migration.

(/usr/local/ey_resin/ruby/bin/gem list engineyard-serverside | grep 'engineyard-serverside ' | egrep -q '1\.6\.4[,)]') || (sudo sh -c 'cd `mktemp -d` && /usr/local/ey_resin/ruby/bin/gem install engineyard-serverside --no-rdoc --no-ri -v 1.6.4')



Warning: Permanently added '23.21.153.147' (RSA) to the list of known hosts.

/usr/local/ey_resin/ruby/bin/engineyard-serverside _1.6.4_ deploy --app analytics_production --config '{"deployed_by":"Loren Johnson"}' --framework-env staging --instance-roles ec2-23-20-181-244.compute-1.amazonaws.com:app ec2-23-21-153-147.compute-1.amazonaws.com:app_master --instances ec2-23-20-181-244.compute-1.amazonaws.com ec2-23-21-153-147.compute-1.amazonaws.com --ref ce1a3b2030fcc65874ffbdcc595b561460774145 --repo git@brandinformatics.unfuddle.com:brandinformatics/analytics.git --stack nginx_unicorn --verbose

lorenjohnson

# On branch rails3_taxonomy_mashup
# Changes to be committed:
#
#	modified:   app/controllers/admin/accounts_controller.rb
#	new file:   app/controllers/admin/industry_compositions_controller.rb
#	new file:   app/controllers/admin/industry_segment_categories_controller.rb
#	new file:   app/controllers/admin/industry_statements_controller.rb
#	new file:   app/controllers/admin/industry_taxonomies_controller.rb
#	modified:   app/controllers/admin/segments_controller.rb
#	new file:   app/controllers/admin/statement_customizations_controller.rb

lorenjohnson

diff --cc app/views/steps/edit.html.erb
index 346c97b,9b320ba..0000000
--- a/app/views/steps/edit.html.erb
+++ b/app/views/steps/edit.html.erb
diff --git a/app/assets/javascripts/angular/c-edit-steps.js b/app/assets/javascripts/angular/c-edit-steps.js
index fd5cfd9..a39fd95 100644
--- a/app/assets/javascripts/angular/c-edit-steps.js
+++ b/app/assets/javascripts/angular/c-edit-steps.js
@@ -1,8 +1,8 @@
 'use strict';

lorenjohnson

diff --git a/config/unicorn.rb b/config/unicorn.rb
index 384149f..41047ea 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -2,7 +2,7 @@ worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
 timeout 15
 preload_app true
 
-listen ENV['PORT'], :backlog => Integer(ENV['UNICORN_BACKLOG'] || 200)
+# listen ENV['PORT'], :backlog => Integer(ENV['UNICORN_BACKLOG'] || 200)

lorenjohnson

diff --git a/app/assets/javascripts/angular/c-edit-steps.js b/app/assets/javascripts/angular/c-edit-steps.js
index 91cccca..a39fd95 100644
--- a/app/assets/javascripts/angular/c-edit-steps.js
+++ b/app/assets/javascripts/angular/c-edit-steps.js
@@ -1,8 +1,8 @@
 'use strict';
 // view posts (steps) controller
 // for editing and deleting posts:
-makerSpaceApp.controller('EditStepsCtrl', ['$scope', '$http', 'flowFactory',
-  function ($scope, $http, flowFactory) {

lorenjohnson

diff --git a/app/assets/javascripts/angular/c-edit-steps.js b/app/assets/javascripts/angular/c-edit-steps.js
index 91cccca..a39fd95 100644
--- a/app/assets/javascripts/angular/c-edit-steps.js
+++ b/app/assets/javascripts/angular/c-edit-steps.js
@@ -1,8 +1,8 @@
 'use strict';
 // view posts (steps) controller
 // for editing and deleting posts:
-makerSpaceApp.controller('EditStepsCtrl', ['$scope', '$http', 'flowFactory',
-  function ($scope, $http, flowFactory) {