Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:Jarred-Sumner/FundingList.us

Conflicts:
	app/views/companies/show.html.erb
  • Loading branch information...
commit 4fad9acbeba3f90f2e51ab18bc431f5cde0ca0bb 2 parents aae59c5 + 06b12be
Jarred Sumner authored
Showing with 9 additions and 3 deletions.
  1. +7 −1 app/views/companies/show.html.erb
  2. +2 −2 config/database.yml
View
8 app/views/companies/show.html.erb
@@ -6,7 +6,13 @@
<h1><%= @company.name %></h1>
<div id='chart'>
</div>
- <%= render 'update_me' %>
+ <div id='update_me_container'>
+ <div id='update_me' class='btn btn-primary'>Keep Me Updated</div>
+ </div>
+ <div id="more_info">
+ <%= render 'related_people' %>
+ <%= render 'rounds' %>
+ </div>
</div>
</div>
<%= javascript_include_tag "show_companies" %>
View
4 config/database.yml
@@ -23,5 +23,5 @@ production:
adapter: postgresql
database: fundinglist
user: postgres
- pool: 5
- timeout: 5000
+ pool: 10
+ timeout: 8000
Please sign in to comment.
Something went wrong with that request. Please try again.