wrong namespace for the Liquid::SyntaxError + comment the deployment settings when generating a bootstrap3 site
did
committed Sep 22, 2014
commit 94fb8227757578f28954304a0d5f3bc03e6059c4
Showing 3
changed files with
31 additions
and 31 deletions
generators/bootstrap2/config/deploy.yml
+15
-15
| @@ | @@ -1,15 +1,15 @@ |
| - | development: |
| - | host: dev.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| - | staging: |
| - | host: staging.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| - | production: |
| - | host: www.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| \ No newline at end of file | |
| + | # development: |
| + | # host: dev.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| + | # staging: |
| + | # host: staging.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| + | # production: |
| + | # host: www.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| \ No newline at end of file | |
generators/bootstrap3/config/deploy.yml
+15
-15
| @@ | @@ -1,15 +1,15 @@ |
| - | development: |
| - | host: dev.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| - | staging: |
| - | host: staging.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| - | production: |
| - | host: www.example.com |
| - | email: john@doe.net |
| - | password: apassword |
| - | # api_key: <your api key here> |
| \ No newline at end of file | |
| + | # development: |
| + | # host: dev.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| + | # staging: |
| + | # host: staging.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| + | # production: |
| + | # host: www.example.com |
| + | # email: john@doe.net |
| + | # password: apassword |
| + | # # api_key: <your api key here> |
| \ No newline at end of file | |
locomotive/wagon/misc/mounter.rb b/lib/locomotive/wagon/misc/mounter.rb
+1
-1
| @@ | @@ -19,7 +19,7 @@ module Locomotive |
| begin | |
| template = ::Liquid::Template.parse(self.source, options) | |
| - | rescue Liquid::SyntaxError => e |
| + | rescue ::Liquid::SyntaxError => e |
| # do it again on the raw source instead so that the error line matches | |
| # the source file. | |
| ::Liquid::Template.parse(self.template.raw_source, options) | |