This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daemon off; | |
worker_processes auto; | |
events { | |
use epoll; | |
accept_mutex on; | |
worker_connections <%= worker_connections %>; | |
} | |
http { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
javascript:(function(window, document) { | |
var isScrolling, scrollTimeout; | |
var defaultScrollSpeed = 50; | |
var scrollSpeed = 50; | |
var adjustIncrement = 2; | |
var jumpIncrement = 50; | |
function start() { | |
window.addEventListener('keydown', keyPressed); | |
window.addEventListener('keyup', keyReleased, false); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
javascript:(function(window, document) { | |
var isScrolling, scrollTimeout; | |
var defaultScrollSpeed = 50; | |
var scrollSpeed = 50; | |
var adjustIncrement = 2; | |
var jumpIncrement = 50; | |
function start() { | |
window.addEventListener('keydown', keyPressed); | |
window.addEventListener('keyup', keyReleased, false); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class Notifications::NotifyMentioned | |
include Service | |
include Virtus.model | |
attribute :instance | |
attribute :get_stream_client | |
attribute :get_stream_activity_builder | |
def call |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 [email protected]:brandinformatics/analytics.git --stack nginx_unicorn --verbose |
NewerOlder