From 3a157b697f8d36653f6f83e88626ad19ba64fe3b Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Wed, 25 Mar 2015 20:03:28 +0000 Subject: [PATCH] referencing stripe from its repo breaks rubygems install for some reason --- Gemfile | 2 +- Gemfile.lock | 3 +-- models/event.rb | 2 +- rainbows_config.rb | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 159a70f6..b5a3e08c 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'mail' gem 'google-api-client', require: 'google/api_client' gem 'tilt' gem 'erubis' -gem 'stripe', source: 'https://code.stripe.com/' +gem 'stripe' #, source: 'https://code.stripe.com/' gem 'screencap' gem 'cocaine' gem 'zipruby' diff --git a/Gemfile.lock b/Gemfile.lock index e74167f8..e726b123 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,5 @@ GEM remote: https://rubygems.org/ - remote: https://code.stripe.com/ specs: activesupport (4.1.4) i18n (~> 0.6, >= 0.6.9) @@ -279,7 +278,7 @@ DEPENDENCIES sinatra sinatra-flash sinatra-xsendfile - stripe! + stripe stripe-ruby-mock (~> 2.0.1) thread tilt diff --git a/models/event.rb b/models/event.rb index 4c3d3a6e..16feafb7 100644 --- a/models/event.rb +++ b/models/event.rb @@ -13,7 +13,7 @@ class Event < Sequel::Model many_to_one :actioning_site, key: :actioning_site_id, class: :Site DEFAULT_GLOBAL_LIMIT = 300 - GLOBAL_VIEWS_MINIMUM = 50 + GLOBAL_VIEWS_MINIMUM = 5 def self.global_dataset(current_page=1, limit=DEFAULT_GLOBAL_LIMIT) select_all(:events). diff --git a/rainbows_config.rb b/rainbows_config.rb index 27c80a68..e30fd79a 100644 --- a/rainbows_config.rb +++ b/rainbows_config.rb @@ -23,7 +23,7 @@ Rainbows! do worker_processes processor_count worker_connections 32 - timeout 10 + timeout 600 # 10 minutes listen "unix:/var/run/neocities/neocities.sock", :backlog => 2048