Denny Schäfer
|
001bd32bb3
|
Fix markdown typo
|
2018-01-11 00:20:23 +01:00 |
|
Jeremy Cook
|
7080321081
|
Regenerate gemspec for version 1.1.6
v1.1.6
|
2017-12-20 16:03:17 -05:00 |
|
Jeremy Cook
|
9d9cf66de6
|
Prepare for release of new version
|
2017-12-20 16:01:20 -05:00 |
|
Jeremy Cook
|
9e9a940825
|
Merge pull request #170 from diraol/fix-fileutils
Require fileutils correctly
|
2017-12-18 10:48:14 -05:00 |
|
Diego Rabatone Oliveira
|
257e974c38
|
Require fileutils correctly
Fix #165
|
2017-12-18 13:40:44 -02:00 |
|
Jeremy Cook
|
615e31428c
|
Merge pull request #167 from mail6543210/master
Fix "diff" action on binary files
|
2017-10-13 17:59:36 -04:00 |
|
mail6543210
|
8c2a1d0f84
|
Add testcase
|
2017-09-23 00:41:33 +08:00 |
|
mail6543210
|
62c934774b
|
Real fix for #148
|
2017-09-19 20:30:15 +08:00 |
|
mail6543210
|
d3d6974b7b
|
Rename content to source
It is a instance of Pathname, not binary content
|
2017-09-19 20:29:06 +08:00 |
|
mail6543210
|
474d69da0b
|
Revert "Use source content instead of source path (fixes: #148)"
This reverts commit ed397bdaf8.
|
2017-09-19 20:26:01 +08:00 |
|
Jeremy Cook
|
db6a513d1d
|
Merge pull request #166 from MainShayne233/master
Enhancement/Add 'to' to error message.
|
2017-09-02 19:59:40 -04:00 |
|
Shayne Tremblay
|
ae343c4cab
|
Add 'to' to error message.
|
2017-09-02 13:06:46 -07:00 |
|
Jeremy Cook
|
a2b365fb6f
|
Merge pull request #164 from fuzzbomb/update-README-symlink-command
Rename symlink command to link in README.
|
2017-08-28 12:55:50 -04:00 |
|
Andrew Macpherson
|
4cb2006f41
|
Rename symlink command to link in README.
symlink command was previously renamed to link, but references in the README
were not updated.
|
2017-06-12 17:37:45 +01:00 |
|
Jeremy Cook
|
66347d307f
|
Merge pull request #161 from philoserf/patch-1
Update ChangeLog.markdown
|
2017-03-23 17:33:31 -04:00 |
|
Mark Ayers
|
8f92a1b4f0
|
Update ChangeLog.markdown
Add the space that markdown requires between the header marker `#` and the header text.
|
2017-03-23 13:44:33 -07:00 |
|
Jeremy Cook
|
7a2df591c0
|
Regenerate gemspec for version 1.1.5
v1.1.5
|
2017-03-23 08:37:44 -04:00 |
|
Jeremy Cook
|
4923265dea
|
Updated homesick version and changelog due to problem with version
number in release.
|
2017-03-23 08:34:47 -04:00 |
|
Jeremy Cook
|
79421580e9
|
Merge branch 'master' of github.com:technicalpickles/homesick
|
2017-03-22 17:24:28 -04:00 |
|
Jeremy Cook
|
cabde9e5f1
|
Updated change log for new version.
|
2017-03-22 17:23:49 -04:00 |
|
Jeremy Cook
|
0d60ae9d1a
|
Regenerate gemspec for version 1.1.4
v1.1.4
|
2017-03-22 17:14:09 -04:00 |
|
Jeremy Cook
|
d5317b8e17
|
Bumped version in preparation for release.
|
2017-03-22 17:10:23 -04:00 |
|
Jeremy Cook
|
3b8a5b4be4
|
Merge pull request #159 from mruwek/refactor-conflict-actions
Wrap symlink and regular conflicts into one case
|
2017-03-20 16:07:19 -04:00 |
|
Jacek Sowiński
|
6590a1eeff
|
Wrap symlink and regular conflicts into one case
This way we're not duplicating collision-related code.
|
2017-03-20 20:26:14 +01:00 |
|
Jeremy Cook
|
693ae5f05e
|
Merge pull request #157 from mruwek/verbose-symlink-conflicts
Don't overwrite silently on symlink conflicts
|
2017-03-19 22:02:41 -04:00 |
|
Jeremy Cook
|
da3002f199
|
Merge pull request #154 from singular0/symlink_realpath
Use real paths of symlinks when linking castle into home
|
2017-03-19 22:02:01 -04:00 |
|
Jeremy Cook
|
feaaab2fa4
|
Merge pull request #158 from JCook21/master
Minor updates
|
2017-03-19 22:00:34 -04:00 |
|
Jeremy Cook
|
59f75711a4
|
Changed strings to use symbols.
|
2017-03-19 15:57:44 -04:00 |
|
Jeremy Cook
|
f24030b51f
|
Updates to Gemfile to clean it up.
|
2017-03-19 15:57:22 -04:00 |
|
Jeremy Cook
|
71bb120a12
|
Update to dependency.
|
2017-03-19 14:44:44 -04:00 |
|
Jacek Sowiński
|
85f46e01b1
|
Don't overwrite silently on symlink conflicts
Symlink conflicts are now handled in similar fashion as normal
file-conflicts.
|
2017-03-17 19:31:23 +01:00 |
|
Jeremy Cook
|
c5b24b9b38
|
Merge pull request #155 from danielbayerlein/ruby-2.4.0
Add support for Ruby 2.4.0
|
2016-12-26 07:08:38 -05:00 |
|
Daniel Bayerlein
|
68460af45e
|
Add support for Ruby 2.4.0
|
2016-12-26 10:31:34 +01:00 |
|
Denis Yantarev
|
5614b6b8b3
|
Use real paths of symlinks when linking castle into home
|
2016-12-25 18:34:33 +03:00 |
|
Jeremy Cook
|
570b063632
|
Merge pull request #152 from singular0/master
Thanks for taking care of this.
|
2016-12-24 12:13:55 -05:00 |
|
Jeremy Cook
|
1d398587d0
|
Remove config for removed ruby versions.
Deleted config for unused ruby versions.
|
2016-12-24 12:11:01 -05:00 |
|
Jeremy Cook
|
085853faaa
|
Merge branch 'master' into master
|
2016-12-24 12:05:54 -05:00 |
|
Jeremy Cook
|
21b4e344a9
|
Merge pull request #153 from danielbayerlein/ruby-version
Looks good to me, thanks!
|
2016-12-24 12:03:51 -05:00 |
|
Daniel Bayerlein
|
a6194dfe8b
|
Update RSpec
|
2016-12-23 11:59:44 +01:00 |
|
Daniel Bayerlein
|
5692194fa2
|
Add support for Ruby 2.2.6 and 2.3.3
|
2016-12-23 11:37:47 +01:00 |
|
Daniel Bayerlein
|
11745098c2
|
Support Ruby 2.1.0, 2.2.0, 2.3.0
|
2016-12-23 11:23:11 +01:00 |
|
Denis Yantarev
|
b1bb0c996c
|
Add Ruby 2.2 & 2.3 to Travis config and fix GEM dependencies
|
2016-12-05 03:34:57 +03:00 |
|
Denis Yantarev
|
a62039da50
|
Ignore rbenv configuration files
|
2016-12-05 03:34:14 +03:00 |
|
Denis Yantarev
|
4bfd1c60c2
|
Fix default option value type warning
|
2016-12-03 15:56:22 +03:00 |
|
Jeremy Cook
|
f0e11abb5b
|
Merge pull request #149 from mail6543210/master
Use source content instead of source path (fixes: #148). Thanks for fixing this!
|
2016-01-21 20:05:33 -05:00 |
|
mail6543210
|
ed397bdaf8
|
Use source content instead of source path (fixes: #148)
|
2016-01-21 18:36:52 +08:00 |
|
Jeremy Cook
|
2f5e20d963
|
Fixed formatting in Changelog file.
|
2015-10-31 09:54:41 -04:00 |
|
Jeremy Cook
|
cc83a4e1fa
|
Preparing for 1.1.3 release.
v1.1.3
|
2015-10-31 09:48:10 -04:00 |
|
Jeremy Cook
|
dcc5cb0bc1
|
Merge pull request #146 from JCook21/issue134
Fix for issue134
|
2015-10-25 15:21:26 -04:00 |
|
Jeremy Cook
|
978416d1e4
|
Fixing diff problems by providing source block and checking for
directories in diff
|
2015-10-20 21:47:43 -04:00 |
|