Merge branch 'master' of github.com:internetee/registry

This commit is contained in:
Martin Lensment 2014-12-02 17:51:06 +02:00
commit 4f706d7100
4 changed files with 14 additions and 5 deletions

View file

@ -132,7 +132,7 @@ group :development, :test do
# Spring speeds up development by keeping your application running in the background.
# Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring', '~> 1.2.0'
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', '~> 0.4.0'
@ -153,4 +153,7 @@ group :development, :test do
# faster dev load time
gem 'unicorn'
# for fast deployment
gem 'mina', '~> 0.3.1'
end

View file

@ -169,12 +169,16 @@ GEM
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.25.1)
mina (0.3.1)
open4 (~> 1.3.4)
rake
mini_portile (0.6.0)
minitest (5.4.3)
multi_json (1.10.1)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
nprogress-rails (0.1.3.1)
open4 (1.3.4)
orm_adapter (0.5.0)
paper_trail (3.0.6)
activerecord (>= 3.0, < 5.0)
@ -301,7 +305,7 @@ GEM
temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1)
slop (3.6.0)
spring (1.1.3)
spring (1.2.0)
sprockets (2.8.0)
hike (~> 1.2)
multi_json (~> 1.0)
@ -387,6 +391,7 @@ DEPENDENCIES
jbuilder (~> 2.0)
jquery-rails
kaminari (~> 0.16.1)
mina (~> 0.3.1)
nokogiri (~> 1.6.2.1)
nprogress-rails (~> 0.1.3.1)
paper_trail (~> 3.0.5)
@ -407,7 +412,7 @@ DEPENDENCIES
shoulda-matchers (~> 2.6.1)
simplecov (~> 0.9.1)
simpleidn (~> 0.0.5)
spring
spring (~> 1.2.0)
therubyracer
traceroute (~> 0.4.0)
turbolinks

View file

@ -91,8 +91,8 @@ task deploy: :environment do
to :launch do
queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt"
queue 'RAILS_ENV=production bin/delayed_job stop'
queue 'RAILS_ENV=production bin/delayed_job start'
#queue 'RAILS_ENV=production bin/delayed_job stop'
#queue 'RAILS_ENV=production bin/delayed_job start'
end
end
end

View file

@ -1,4 +1,5 @@
Setting.disclosure_name = true if Setting.disclosure_name.nil?
Setting.disclosure_name = true if Setting.disclosure_name.nil?
Setting.disclosure_org_name = true if Setting.disclosure_org_name.nil?
Setting.disclosure_email = true if Setting.disclosure_email.nil?
Setting.disclosure_phone = false if Setting.disclosure_phone.nil?