Skip to content

Commit 97443ab

Browse files
committed
Merge branch 'master' into release
* master: Updated CHANGELOG Updated dependencies Update ISSUE_TEMPLATE.md
2 parents 2f40a17 + b1a05f2 commit 97443ab

File tree

5 files changed

+41
-25
lines changed

5 files changed

+41
-25
lines changed

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Before submitting your issue, please make sure that you've checked all of the checkboxes below.
22

33
- [ ] You're running the [latest release](https://github.com/REBElinBLUE/deployer/releases/latest) version of Deployer.
4-
- [ ] Ensure that you're running at least PHP 5.5.9, you can check this by running `php -v`
4+
- [ ] Ensure that you're running at least PHP 5.6.4, you can check this by running `php -v`
55
- [ ] You've ran `composer install --no-dev` from the root of your installation.
66
- [ ] You've ran `npm install --production` from the root of your installation.
77
- [ ] You've ran `rm -rf bootstrap/cache/*` from the root of your installation.

CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change Log
22

3+
## [0.0.42](https://github.com/REBELinBLUE/deployer/tree/0.0.42) (2017-02-21)
4+
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.41...0.0.42)
5+
36
## [0.0.41](https://github.com/REBELinBLUE/deployer/tree/0.0.41) (2017-02-21)
47
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.40...0.0.41)
58

@@ -68,6 +71,11 @@
6871
- Installer gets into an infinite loop if there are PDO drivers loaded before MySQL [\#254](https://github.com/REBELinBLUE/deployer/pull/254) ([moxx](https://github.com/moxx))
6972
- Incorrect Lang variables [\#239](https://github.com/REBELinBLUE/deployer/pull/239) ([uLow](https://github.com/uLow))
7073

74+
**Closed issues:**
75+
76+
- Acting strange [\#233](https://github.com/REBELinBLUE/deployer/issues/233)
77+
- Custom deployment templates [\#174](https://github.com/REBELinBLUE/deployer/issues/174)
78+
7179
## [0.0.36](https://github.com/REBELinBLUE/deployer/tree/0.0.36) (2016-05-30)
7280
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.35...0.0.36)
7381

@@ -98,7 +106,9 @@
98106

99107
**Closed issues:**
100108

109+
- Deployer callback URL - Laravel error [\#225](https://github.com/REBELinBLUE/deployer/issues/225)
101110
- Process Output don't show full log [\#219](https://github.com/REBELinBLUE/deployer/issues/219)
111+
- node socket server exited itself [\#218](https://github.com/REBELinBLUE/deployer/issues/218)
102112
- Split Vagrant machine into a seperate repository [\#214](https://github.com/REBELinBLUE/deployer/issues/214)
103113

104114
## [0.0.34](https://github.com/REBELinBLUE/deployer/tree/0.0.34) (2016-04-26)
@@ -137,6 +147,10 @@
137147
- Exception when project has deployments but none are 'completed' [\#188](https://github.com/REBELinBLUE/deployer/issues/188)
138148
- Throttling interferes with heartbeart URLS [\#153](https://github.com/REBELinBLUE/deployer/issues/153)
139149

150+
**Closed issues:**
151+
152+
- Don't delete failed deployments when in debug mode [\#181](https://github.com/REBELinBLUE/deployer/issues/181)
153+
140154
**Merged pull requests:**
141155

142156
- Added HTTP and Node instructions to Install section [\#185](https://github.com/REBELinBLUE/deployer/pull/185) ([Patabugen](https://github.com/Patabugen))
@@ -158,6 +172,11 @@
158172
- Refresh JWT when it expires [\#180](https://github.com/REBELinBLUE/deployer/issues/180)
159173
- SQLite installation no longer works [\#169](https://github.com/REBELinBLUE/deployer/issues/169)
160174

175+
**Closed issues:**
176+
177+
- Aborting a deployment before the git info has been loaded leaves the committer etc as "Loading..." [\#150](https://github.com/REBELinBLUE/deployer/issues/150)
178+
- Persistent file permissions [\#93](https://github.com/REBELinBLUE/deployer/issues/93)
179+
161180
## [0.0.29](https://github.com/REBELinBLUE/deployer/tree/0.0.29) (2016-02-05)
162181
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.28...0.0.29)
163182

@@ -223,6 +242,12 @@
223242
- How to make a Symfony application deploy [\#133](https://github.com/REBELinBLUE/deployer/issues/133)
224243
- Fatal error when deploy starts [\#91](https://github.com/REBELinBLUE/deployer/issues/91)
225244

245+
**Closed issues:**
246+
247+
- Provide composer auth details [\#132](https://github.com/REBELinBLUE/deployer/issues/132)
248+
- websocket not updates the screen [\#125](https://github.com/REBELinBLUE/deployer/issues/125)
249+
- Add the option for a full clone [\#101](https://github.com/REBELinBLUE/deployer/issues/101)
250+
226251
## [0.0.22](https://github.com/REBELinBLUE/deployer/tree/0.0.22) (2015-11-15)
227252
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.21...0.0.22)
228253

@@ -238,6 +263,10 @@
238263
- Production CSS is broken [\#111](https://github.com/REBELinBLUE/deployer/issues/111)
239264
- Fix database timeout issue with worker daemon. [\#116](https://github.com/REBELinBLUE/deployer/pull/116) ([dancryer](https://github.com/dancryer))
240265

266+
**Closed issues:**
267+
268+
- Socket.io not working when changing from apache2 to ngnix. [\#120](https://github.com/REBELinBLUE/deployer/issues/120)
269+
241270
## [0.0.21](https://github.com/REBELinBLUE/deployer/tree/0.0.21) (2015-10-10)
242271
[Full Changelog](https://github.com/REBELinBLUE/deployer/compare/0.0.20...0.0.21)
243272

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.0.41
1+
0.0.43-dev

composer.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"pda/pheanstalk": "~3.1",
4242
"pragmarx/google2fa": "^1.0.0",
4343
"predis/predis": "~1.0",
44-
"robclancy/presenter": "1.3.1",
44+
"robclancy/presenter": "~1.3",
4545
"tymon/jwt-auth": "~0.5",
4646
"version/version": "^2.2"
4747
},
@@ -107,9 +107,6 @@
107107
"michele-angioni/multi-language": {
108108
"Laravel 5.4 support for PHP 5.6": "https://www.phpdeployment.org/patches/0002-Multilanguage.patch"
109109
},
110-
"robclancy/presenter": {
111-
"Laravel 5.4 support": "https://www.phpdeployment.org/patches/0001-Presenter.patch"
112-
},
113110
"laravel-notification-channels/twilio": {
114111
"5.4 bug fix": "https://www.phpdeployment.org/patches/0003-dependency-resolution-bug.patch"
115112
}

composer.lock

+9-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)