Commit graph

194 commits

Author SHA1 Message Date
Emilio Forrer
a8c6fdafef Fixing dependency error while activating asset_hash 2015-02-22 21:18:59 -06:00
Emilio Forrer
9eece01aef Fixing compatibility issues with middleman v4.0.0.beta.1 2015-02-22 15:52:52 -06:00
Karl Freeman
000cabda96 Merge pull request #84 from Aupajo/fix/git-email-in-force-push
Fix Git user.email change in force push strategy
2015-01-18 10:22:37 +00:00
Pete Nicholls
4b79845d53 Fix Git user.email change in force push strategy 2015-01-18 14:51:25 +13:00
Karl Freeman
21d04f253a latest travis 2014-11-21 18:25:10 +00:00
Karl Freeman
7360fcadc4 1.0 2014-11-21 17:26:59 +00:00
Karl Freeman
bd5e214614 Merge pull request #70 from Gee-Bee/git-user-details
Respect user details of git repo.
2014-11-21 17:08:03 +00:00
Karl Freeman
217af0d33c Merge pull request #77 from mconnell/master
Prevent bad commits deploying. (git)
2014-11-21 17:07:11 +00:00
Karl Freeman
8a0bfaec2b RuboCop 2014-11-21 17:00:23 +00:00
Mark Connell
79d86af7be Prevent bad commits deploying.
In the event of a fatal error occuring when trying to add content to
git for commit, you end up pushing a blank commit to the git respository.
This is a change which halts the push to a git repository so you don't
accidentally take down your website.
2014-09-04 11:25:57 +01:00
Karl Freeman
b84f69f54a Merge pull request #74 from philippbosch/patch-1
Fix version number in installation instructions
2014-08-19 15:50:33 +01:00
Philipp Bosch
c466746266 Fix version number in installation instructions 2014-08-19 16:12:24 +02:00
Karl Freeman
546542032f changelog 2014-08-14 11:38:48 +01:00
Karl Freeman
5486033a11 Merge branch 'master' of github.com:karlfreeman/middleman-deploy 2014-08-14 11:36:13 +01:00
Karl Freeman
70863dc312 bump 2014-08-14 11:34:48 +01:00
Karl Freeman
6e7ce4d72d Merge branch 'cleanup/major'
Conflicts:
	README.md
2014-08-14 11:32:14 +01:00
Karl Freeman
e14f90fe1d cleanup 2014-08-14 11:18:58 +01:00
Karl Freeman
359f7d7431 Merge pull request #71 from statonjr/patch-1
Fix ArgumentError in SFTP
2014-08-08 09:09:05 +01:00
Larry Staton Jr.
2aba441a30 Update sftp.rb
Fix ArgumentError on exception. Line 55 had 2 arguments, but the `handle_exception` method in line 30 only required 1 argument.
2014-07-20 18:11:30 -04:00
Gee-Bee
bfe6473000 Fix comment. 2014-07-18 09:35:27 +02:00
Gee-Bee
4f9d4879d7 Respect user details of git repo.
Branch with compiled pages respects repo's user details settings.
2014-07-16 10:56:58 +02:00
Karl Freeman
84b3cb0121 no longer needed 👍 2014-05-28 11:11:59 +01:00
Tom Vaughan
71c4e6339b Bump. 2014-05-25 02:07:26 -04:00
Tom Vaughan
b8069d3144 Help! I still need somebody! 2014-05-24 15:22:05 -04:00
Tom Vaughan
fa339eba4f Help! I need somebody! 2014-05-24 15:19:25 -04:00
Tom Vaughan
84e86e2530 Merge pull request #65 from NARKOZ/custom-commit-message
add ability to set custom commit message for git deploys
2014-05-24 14:55:38 -04:00
Nihad Abbasov
efd66e7fca add ability to set custom commit message for git deploys
issue #64
2014-05-24 23:35:14 +05:00
Tom Vaughan
08e392fc6b Merge pull request #60 from jackcasey/master
Tiny change to README to suggest using 'system' over 'exec'
2014-03-20 10:23:58 -05:00
Jack Casey
4fe4526807 Tiny change to README to suggest using 'system' over 'exec'
Reason being, 'exec' will run the shell command and then exit the ruby
process. While 'system will run the shell command and then continue
execution.

I feel this is a better example as the first thing I did was write a
rake task that chains multiple tasks together and the way 'exec' was
ending the process cost me a bit of time trouble shooting why.
2014-03-20 23:10:03 +08:00
Tom Vaughan
6c426c0ef3 bump 2014-02-26 08:39:50 -03:00
Tom Vaughan
c381b6448f Merge pull request #59 from andlum/replacing-run-with-exec-in-rsync
No method 'run' in rsync.rb
2014-02-26 08:38:34 -03:00
Andrew Lum
da58498102 Update rsync.rb 2014-02-26 19:04:08 +08:00
Tom Vaughan
d494a4faf7 bump 2014-02-23 19:00:00 -03:00
Tom Vaughan
dca25529a3 Merge pull request #57 from crtvhd/master
Use binary transfer mode for all files to prevent corrupt images when deploying via FTP
2014-02-23 18:58:34 -03:00
Martin Wessely
774e656cfa Upload all files as binary to prevent corrupt images 2014-02-23 22:07:30 +01:00
Tom Vaughan
8226bba8b3 bump 2014-02-23 13:52:02 -03:00
Tom Vaughan
e729af6b02 Merge pull request #56 from xinminlabs/master
add port reader for ftp method
2014-02-23 13:51:07 -03:00
Richard Huang
0bd94419ea add port reader for ftp method 2014-02-24 00:44:11 +08:00
Tom Vaughan
e89b403ad8 bump 2014-02-23 11:36:02 -03:00
Tom Vaughan
865b98f1c0 Ensure -e ssh ... is always passed to rsync. Fixes #54 2014-02-23 11:27:50 -03:00
Tom Vaughan
c22ff4bc15 Merge pull request #52 from whitetrefoil/master
Why not let the port of SFTP configurable?
2014-02-23 11:09:15 -03:00
Tom Vaughan
1d120c0112 Merge pull request #55 from derek-watson/features/environments_readme
Multiple Environments readme
2014-02-23 11:07:04 -03:00
Derek Watson
ae68d40616 whitespace 2014-02-22 23:24:54 -05:00
Derek Watson
dbaef1ead7 refined language 2014-02-22 23:23:27 -05:00
Derek Watson
669763b878 rmeoved conflicts 2014-02-22 23:22:24 -05:00
Derek Watson
4e46a4e3e7 Merge branch 'features/environments_readme' of github.com:derek-watson/middleman-deploy into features/environments_readme
Conflicts:
	README.md
2014-02-22 23:19:34 -05:00
Derek Watson
a7e90214f2 documented multiple environment config 2014-02-22 23:18:38 -05:00
Derek Watson
260665eef9 documented multiple environment config 2014-02-22 23:13:13 -05:00
WhiteTrefoil
08875eebec Supporting port config of SFTP 2014-01-18 21:55:50 +08:00
Tom Vaughan
83c24d7443 Merge pull request #53 from cveneziani/refactoring
Refactoring
2014-01-18 05:15:23 -08:00