From 197120a9eb68c8a629f05979a7f1d44050bc7b3c Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:09:33 +0100 Subject: [PATCH 1/4] add buildpack url --- .buildpacks | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildpacks b/.buildpacks index 36201cad..08c5a04b 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,3 +1,4 @@ +https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From 48880ad1843fc5ab37e36fd2dbbf187d1b9720d4 Mon Sep 17 00:00:00 2001 From: Konstantin Haase Date: Tue, 22 Mar 2016 12:27:10 +0100 Subject: [PATCH 2/4] Revert "add buildpack url" This reverts commit 197120a9eb68c8a629f05979a7f1d44050bc7b3c. --- .buildpacks | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildpacks b/.buildpacks index 08c5a04b..36201cad 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,4 +1,3 @@ -https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From b552544d190d49fa1f985a9d16cd9a58915f6d3e Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:27:34 +0100 Subject: [PATCH 3/4] revert --- .buildpacks | 1 - 1 file changed, 1 deletion(-) diff --git a/.buildpacks b/.buildpacks index 08c5a04b..36201cad 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,4 +1,3 @@ -https://github.com/ddollar/heroku-buildpack-multi https://github.com/heroku/heroku-buildpack-ruby.git https://github.com/drogus/last-commit-sha-buildpack.git https://github.com/ryandotsmith/nginx-buildpack.git From 71813bf92a67dd43a141a4f327a80e2ff6ed6692 Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 22 Mar 2016 12:35:28 +0100 Subject: [PATCH 4/4] move travis-migrations into main group --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index bf2e564b..9c08569e 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,7 @@ gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil gem 'travis-yaml', github: 'travis-ci/travis-yaml' +gem 'travis-migrations', github: 'travis-ci/travis-migrations' gem 'mustermann', github: 'rkh/mustermann' gem 'sinatra' gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil @@ -41,7 +42,6 @@ group :test do gem 'factory_girl', '~> 2.4.0' gem 'mocha', '~> 0.12' gem 'database_cleaner', '~> 0.8.0' - gem 'travis-migrations', github: 'travis-ci/travis-migrations' end group :development do