Skip to content
Browse files

Fixes heroku_san's external config repo usage

  • Loading branch information...
1 parent e9b7ebd commit 10a13ea66c7a4a5e45f2553fd64a6687d66669c1 @rahearn rahearn committed Feb 9, 2013
Showing with 10 additions and 23 deletions.
  1. +2 −2 Gemfile
  2. +6 −19 Gemfile.lock
  3. +2 −2 config/heroku.yml
View
4 Gemfile
@@ -24,7 +24,7 @@ gem "kaminari"
# pictures
gem 'carrierwave'
-gem 'rmagick'
+gem 'rmagick', '~> 2.13.2'
gem 'fog'
#Social media is cool?
@@ -58,7 +58,7 @@ group :assets do
end
group :development do
- gem "heroku_san"
+ gem "heroku_san", '~> 4.2.2'
gem "pry"
gem "pry-nav"
end
View
25 Gemfile.lock
@@ -135,17 +135,9 @@ GEM
activesupport (~> 3.0)
haml (~> 3.0)
railties (~> 3.0)
- heroku (2.30.3)
- heroku-api (~> 0.3.4)
- launchy (>= 0.3.2)
- netrc (~> 0.7.7)
- rest-client (~> 1.6.1)
- rubyzip
- heroku-api (0.3.4)
- excon (~> 0.16.1)
- heroku_san (3.0.4)
- activesupport
- heroku (>= 2)
+ heroku-api (0.3.7)
+ excon (~> 0.16.10)
+ heroku_san (4.2.2)
heroku-api (>= 0.1.2)
rake
hike (1.2.1)
@@ -159,8 +151,6 @@ GEM
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
- launchy (2.1.2)
- addressable (~> 2.3)
libv8 (3.11.8.3)
libwebsocket (0.1.5)
addressable
@@ -178,7 +168,6 @@ GEM
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.6.3)
- netrc (0.7.7)
nokogiri (1.5.6)
orm_adapter (0.4.0)
pg (0.14.0)
@@ -216,9 +205,7 @@ GEM
rdoc (3.12)
json (~> 1.4)
redcarpet (2.1.1)
- rest-client (1.6.7)
- mime-types (>= 1.16)
- rmagick (2.13.1)
+ rmagick (2.13.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
@@ -309,7 +296,7 @@ DEPENDENCIES
forgery
gravatar-ultimate
haml-rails
- heroku_san
+ heroku_san (~> 4.2.2)
i18n-active_record!
jquery-rails
kaminari
@@ -321,7 +308,7 @@ DEPENDENCIES
pygmentize
rails (~> 3.2.9)
redcarpet
- rmagick
+ rmagick (~> 2.13.2)
rspec-rails
sass-rails (~> 3.2.3)
shoulda-matchers
View
4 config/heroku.yml
@@ -7,8 +7,9 @@
# - <Heroku config:var name>: <Heroku config:var value>
#
+config_repo: 'https://github.com/coshx/coshx_configuration'
+
production:
- config_repo: 'https://github.com/coshx/coshx_configuration'
app: coshx-web-production
config:
BUNDLE_WITHOUT: "development:test"
@@ -17,7 +18,6 @@ production:
COSHX_HOST: "www.coshx.com"
staging:
- config_repo: 'https://github.com/coshx/coshx_configuration'
app: coshx-web-staging
config: &default
BUNDLE_WITHOUT: "development:test"

0 comments on commit 10a13ea

Please sign in to comment.
Something went wrong with that request. Please try again.