Commit f8f7823e by tady

fix env setting for travis

parent a1e390f2
...@@ -12,6 +12,7 @@ env: ...@@ -12,6 +12,7 @@ env:
- AWS_S3_BUCKET="rendezvous-travis-bundler" - AWS_S3_BUCKET="rendezvous-travis-bundler"
- RAILS_ENV=test - RAILS_ENV=test
- RV_RENDEZVOUS_APP_HOST=example.com - RV_RENDEZVOUS_APP_HOST=example.com
- RV_HIPCHAT_ROOM=Rendezvousテスト
- secure: A72vqUWQiRal8fCMlobXhYrGVDImUXmrCQGuUc382glay7WdJ4ZsIiVvO1gp8mj7X4HUeejmgY4AUVJy6FmCL4LNxDhdRuOirQ+kOcdsuQKDlMPcbGdoYk23ZBlxeq1tqW9Qs8mNjZYHGx3BFf/qtNhgvTLMr+/wQMZi+110e3g= - secure: A72vqUWQiRal8fCMlobXhYrGVDImUXmrCQGuUc382glay7WdJ4ZsIiVvO1gp8mj7X4HUeejmgY4AUVJy6FmCL4LNxDhdRuOirQ+kOcdsuQKDlMPcbGdoYk23ZBlxeq1tqW9Qs8mNjZYHGx3BFf/qtNhgvTLMr+/wQMZi+110e3g=
services: services:
- mysql - mysql
......
...@@ -32,7 +32,7 @@ class ApisController < ApplicationController ...@@ -32,7 +32,7 @@ class ApisController < ApplicationController
when /\.(jpe?g|png|gif)\Z/ when /\.(jpe?g|png|gif)\Z/
s3_files << { type: 'image', name: file.original_filename, image: res.public_url.to_s } s3_files << { type: 'image', name: file.original_filename, image: res.public_url.to_s }
when /\.pdf\Z/ when /\.pdf\Z/
if Settings.respond_to?(:pdf_uploading) && Settings.pdf_uploading if Settings.enable_pdf_uploading
cover_image_name = "#{Digest::MD5.file(file.path)}-cover.png" cover_image_name = "#{Digest::MD5.file(file.path)}-cover.png"
pdf = Magick::ImageList.new(file.path + '[0]') pdf = Magick::ImageList.new(file.path + '[0]')
cover_tmp = Rails.root.join('tmp', cover_image_name) cover_tmp = Rails.root.join('tmp', cover_image_name)
......
...@@ -41,7 +41,7 @@ class Post < ActiveRecord::Base ...@@ -41,7 +41,7 @@ class Post < ActiveRecord::Base
###################################################################### ######################################################################
after_save :set_watcher! after_save :set_watcher!
after_save :notify_watchers! after_save :notify_watchers!
after_create :notify_hipchat! if Settings.respond_to?(:hipchat) after_create :notify_hipchat! if Settings.hipchat.token.present? && Settings.hipchat.room.present?
###################################################################### ######################################################################
# Named scope # Named scope
......
- if Settings.respond_to?(:google_analytics) && Settings.google_analytics.present? - if Settings.google_analytics.present?
javascript: javascript:
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
......
...@@ -24,7 +24,7 @@ defaults: &defaults ...@@ -24,7 +24,7 @@ defaults: &defaults
google_analytics: <%= ENV['RV_GOOGLE_ANALYTICS_ID'] %> google_analytics: <%= ENV['RV_GOOGLE_ANALYTICS_ID'] %>
# optional # optional
pdf_uploading: <%= ENV['RV_PDF_UPLOADING'].present? %> enable_pdf_uploading: <%= ENV['RV_PDF_UPLOADING'].present? %>
development: development:
<<: *defaults <<: *defaults
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment