allow ssl when pushing/pulling + fix issue #93 (issue in the foundation site template)
did
committed Jul 20, 2013
commit aa583ba8ce385c8a2b98cd4c5bc8f3de49dae8b2
Showing 3
changed files with
20 additions
and 17 deletions
generators/foundation/app/views/pages/index.liquid.haml
+15
-16
| @@ | @@ -98,36 +98,35 @@ published: true |
| {{ 'foundation.min.js' | javascript_tag }} | |
| + | / {{ 'foundation/foundation.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.alerts.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.alerts.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.clearing.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.clearing.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.cookie.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.cookie.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.dropdown.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.dropdown.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.forms.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.forms.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.joyride.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.joyride.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.magellan.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.magellan.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.orbit.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.orbit.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.placeholder.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.placeholder.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.reveal.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.reveal.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.section.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.section.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.tooltips.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.tooltips.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.topbar.js' | javascript_tag }} |
| - | / {{ 'foundation/foundation.topbar.js' | javascript_tag }} |
| - | |
| - | / {{ 'foundation/foundation.interchange.js' | javascript_tag }} |
| + | / {{ 'foundation/foundation.interchange.js' | javascript_tag }} |
| :javascript | |
| $(document).foundation(); | |
locomotive/wagon/cli.rb b/lib/locomotive/wagon/cli.rb
+4
-0
| @@ | @@ -265,6 +265,10 @@ module Locomotive |
| path_to_deploy_file = File.join(path, 'config', 'deploy.yml') | |
| connection_info = YAML::load(File.open(path_to_deploy_file).read)[env.to_s].with_indifferent_access | |
| + | if connection_info[:ssl] && !connection_info[:host].start_with?('https') |
| + | connection_info[:host] = 'https://' + connection_info[:host] |
| + | end |
| + | |
| if connection_info.nil? | |
| raise "No #{env.to_s} environment found in the config/deploy.yml file" | |
| end | |
locomotivecms_wagon.gemspec
+1
-1
| @@ | @@ -31,7 +31,7 @@ Gem::Specification.new do |gem| |
| gem.add_dependency 'listen', '~> 0.7.0' | |
| - | gem.add_dependency 'httmultiparty', '0.3.8' |
| + | gem.add_dependency 'httmultiparty', '0.3.10' |
| gem.add_dependency 'will_paginate', '~> 3.0.3' | |
| gem.add_dependency 'locomotivecms_mounter', '~> 1.2.0' | |