From a3267f20b07be4ab17cf7ecc6a8d9a32445acab5 Mon Sep 17 00:00:00 2001
From: Vokhmin Alexey V <avokhmin@gmail.com>
Date: Fri, 14 Jun 2013 18:45:30 +0400
Subject: [PATCH] #188: rollback .travis.yml, added secret_token

---
 .travis.yml                   | 2 +-
 config/application.yml.travis | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 129ddd5dc..3425969b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ before_install:
 before_script:
   - cp config/database.yml.sample config/database.yml
   - cp config/application.yml.travis config/application.yml
-script: "bundle exec rake db:create db:structure:load db:migrate && bundle exec rake spec"
+  - bundle exec rake db:create db:structure:load db:migrate
 branches:
   only:
 #    - master
diff --git a/config/application.yml.travis b/config/application.yml.travis
index 26f8f146d..d662c59cd 100644
--- a/config/application.yml.travis
+++ b/config/application.yml.travis
@@ -10,8 +10,8 @@ common: &common
   keys:
     key_pair_secret_key: 'key_pair_secret_key'
     airbrake_api_key: 'airbrake_api_key'
-    devise_pepper: 'devise_pepper'
-    secret_token: 'secret_token'
+    devise_pepper: 'e295a79fb7966e94a6e8b184ba65791a'
+    secret_token: 'e295a79fb7966e94a6e8b184ba65791a'
     github:
       id: 'APP_ID'
       secret: 'APP_SECRET'