Skip to content

Migrate to Heroku's Cedar stack #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-gemset
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
demo-activeadmin
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.0.0
26 changes: 16 additions & 10 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
source 'http://rubygems.org'

gem 'rails', '3.0.10'
gem 'sqlite3-ruby', :require => 'sqlite3'
gem 'nifty-generators'
gem "activeadmin", '0.5.0'
gem "faker"
gem 'newrelic_rpm', '3.1.1'
gem 'hoptoad_notifier', '2.4.11'
gem 'rails', '3.0.20'
gem 'activeadmin', '0.6.2'
gem 'unicorn'
gem 'pg'

gem 'mechanize'
gem 'faker'
gem 'rack-throttle'
gem 'newrelic_rpm'
gem 'hoptoad_notifier'

group :development do
gem 'mechanize'
# Debugging
gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
gem 'binding_of_caller' # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2

# Performance
gem 'rack-mini-profiler' # Inline app profiler. See ?pp=help for options.
gem 'flamegraph' # Flamegraph visualiztion: ?pp=flamegraph
end

group :production do
gem 'unicorn'

# Enable gzip compression on heroku, but don't compress images.
gem 'heroku-deflater'

Expand Down
187 changes: 108 additions & 79 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,163 +2,192 @@ GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
actionmailer (3.0.10)
actionpack (= 3.0.10)
actionmailer (3.0.20)
actionpack (= 3.0.20)
mail (~> 2.2.19)
actionpack (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
actionpack (3.0.20)
activemodel (= 3.0.20)
activesupport (= 3.0.20)
builder (~> 2.1.2)
erubis (~> 2.6.6)
i18n (~> 0.5.0)
rack (~> 1.2.1)
rack (~> 1.2.5)
rack-mount (~> 0.6.14)
rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
activeadmin (0.5.0)
arbre (>= 1.0.1)
bourbon (>= 1.0.0)
devise (>= 1.1.2)
fastercsv
formtastic (>= 2.0.0)
inherited_resources (>= 1.3.1)
jquery-rails (>= 1.0.0)
kaminari (>= 0.13.0)
meta_search (>= 0.9.2)
rails (>= 3.0.0)
sass (>= 3.1.0)
activemodel (3.0.10)
activesupport (= 3.0.10)
activeadmin (0.6.2)
arbre (~> 1.0)
bourbon (>= 1.0.0, < 4)
devise (>= 1.5.4, < 4)
formtastic (~> 2.0)
inherited_resources (~> 1.3)
jquery-rails (>= 1.0.0, < 3)
kaminari (~> 0.13)
meta_search (~> 1.0)
rails (>= 3.0.0, < 4)
sass (~> 3.1)
activemodel (3.0.20)
activesupport (= 3.0.20)
builder (~> 2.1.2)
i18n (~> 0.5.0)
activerecord (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activerecord (3.0.20)
activemodel (= 3.0.20)
activesupport (= 3.0.20)
arel (~> 2.0.10)
tzinfo (~> 0.3.23)
activeresource (3.0.10)
activemodel (= 3.0.10)
activesupport (= 3.0.10)
activesupport (3.0.10)
activeresource (3.0.20)
activemodel (= 3.0.20)
activesupport (= 3.0.20)
activesupport (3.0.20)
arbre (1.0.1)
activesupport (>= 3.0.0)
arel (2.0.10)
bcrypt-ruby (3.0.1)
bourbon (2.1.1)
sass (>= 3.1)
bcrypt-ruby (3.1.2)
better_errors (1.0.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bourbon (3.1.8)
sass (>= 3.2.0)
thor
builder (2.1.2)
devise (1.5.3)
coderay (1.1.0)
debug_inspector (0.0.2)
devise (1.5.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
domain_name (0.5.15)
unf (>= 0.0.5, < 1.0.0)
erubis (2.6.6)
abstract (>= 1.0.0)
faker (0.9.5)
i18n (~> 0.4)
fastercsv (1.5.5)
faker (1.2.0)
i18n (~> 0.5)
fast_stack (0.1.0)
rake
rake-compiler
flamegraph (0.0.4)
fast_stack
formtastic (2.2.1)
actionpack (>= 3.0)
has_scope (0.5.1)
heroku-deflater (0.2.0)
hoptoad_notifier (2.4.11)
activesupport
builder
i18n (0.5.0)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.5.2)
inherited_resources (1.3.1)
has_scope (~> 0.5.0)
responders (~> 0.6)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
kaminari (0.13.0)
jquery-rails (2.3.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.1)
kaminari (0.15.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
kgio (2.8.1)
mail (2.2.19)
mail (2.2.20)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mechanize (2.0.1)
mechanize (2.7.2)
domain_name (~> 0.5, >= 0.5.1)
http-cookie (~> 1.0.0)
mime-types (~> 1.17, >= 1.17.2)
net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 1.8)
net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4)
webrobots (~> 0.0, >= 0.0.9)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (>= 0.0.9, < 0.2)
meta_search (1.0.6)
actionpack (~> 3.0.2)
activerecord (~> 3.0.2)
activesupport (~> 3.0.2)
arel (~> 2.0.2)
mime-types (1.16)
net-http-digest_auth (1.1.1)
net-http-persistent (1.9)
newrelic_rpm (3.1.1)
nifty-generators (0.4.6)
nokogiri (1.5.0)
mime-types (1.25.1)
mini_portile (0.5.2)
net-http-digest_auth (1.4)
net-http-persistent (2.9)
newrelic_rpm (3.6.9.171)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
ntlm-http (0.1.1)
orm_adapter (0.0.7)
polyglot (0.3.2)
rack (1.2.3)
pg (0.17.0)
polyglot (0.3.3)
rack (1.2.8)
rack-mini-profiler (0.1.31)
rack (>= 1.1.3)
rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
rack-throttle (0.3.0)
rack (>= 1.0.0)
rails (3.0.10)
actionmailer (= 3.0.10)
actionpack (= 3.0.10)
activerecord (= 3.0.10)
activeresource (= 3.0.10)
activesupport (= 3.0.10)
rails (3.0.20)
actionmailer (= 3.0.20)
actionpack (= 3.0.20)
activerecord (= 3.0.20)
activeresource (= 3.0.20)
activesupport (= 3.0.20)
bundler (~> 1.0)
railties (= 3.0.10)
railties (= 3.0.20)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
railties (3.0.10)
actionpack (= 3.0.10)
activesupport (= 3.0.10)
railties (3.0.20)
actionpack (= 3.0.20)
activesupport (= 3.0.20)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.4)
raindrops (0.12.0)
rake (0.9.2)
rdoc (3.9.4)
rake (10.1.0)
rake-compiler (0.9.2)
rake
rdoc (3.12.2)
json (~> 1.4)
responders (0.6.5)
sass (3.2.1)
sqlite3 (1.3.4)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
sass (3.2.12)
thor (0.14.6)
treetop (1.4.10)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.29)
tzinfo (0.3.38)
unf (0.1.3)
unf_ext
unf_ext (0.0.6)
unicorn (4.7.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
warden (1.2.1)
warden (1.2.3)
rack (>= 1.0)
webrobots (0.0.11)
nokogiri (>= 1.4.4)
webrobots (0.1.1)

PLATFORMS
ruby

DEPENDENCIES
activeadmin (= 0.5.0)
activeadmin (= 0.6.2)
better_errors
binding_of_caller
faker
flamegraph
heroku-deflater
hoptoad_notifier (= 2.4.11)
hoptoad_notifier
mechanize
newrelic_rpm (= 3.1.1)
nifty-generators
newrelic_rpm
pg
rack-mini-profiler
rack-throttle
rails (= 3.0.10)
rails (= 3.0.20)
rails_12factor
sqlite3-ruby
unicorn
3 changes: 3 additions & 0 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
# you've limited to :test, :development, or :production.
Bundler.require(:default, Rails.env) if defined?(Bundler)

# https://github.com/rails/rails/issues/9619
ActionController::Base.config.relative_url_root = ''

require 'rack/throttle'

module ActiveadminDepot
Expand Down
25 changes: 6 additions & 19 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,9 @@
# SQLite version 3.x
# gem install sqlite3-ruby (not necessary on OS X Leopard)
development:
adapter: sqlite3
database: db/development.sqlite3
pool: 5
timeout: 5000
adapter: postgresql
host: localhost
database: demo-activeadmin

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: sqlite3
database: db/test.sqlite3
pool: 5
timeout: 5000

production:
adapter: sqlite3
database: db/production.sqlite3
pool: 5
timeout: 5000
adapter: postgresql
host: localhost
database: demo-activeadmin-test
Loading