Skip to content

Commit 09fe258

Browse files
authored
Merge branch 'master' into varnish
2 parents 2af7bfa + 34daaba commit 09fe258

46 files changed

Lines changed: 2930 additions & 1195 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/devcontainer.example.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
22
"name": "Laradock",
3-
"dockerComposeFile": ["../docker-compose.yml"],
4-
"runServices": ["nginx", "postgres", "pgadmin"],
3+
"dockerComposeFile": "../docker-compose.yml",
4+
"remoteUser": "laradock",
5+
"runServices": [
6+
"nginx",
7+
"postgres",
8+
"pgadmin"
9+
],
510
"service": "workspace",
611
"workspaceFolder": "/var/www",
712
"shutdownAction": "stopCompose",

.github/CODE_OF_CONDUCT.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/CONTRIBUTING.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# DO NOT CHANGE THIS FILE PLEASE.
22

3+
github: Mahmoudz
34
open_collective: laradock
4-
ko_fi: laradock
5-
issuehunt: laradock
6-
custom: ['beerpay.io/laradock/laradock', 'paypal.me/mzmmzz']
5+
custom: ['paypal.me/mzmmzz']

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
name: "Bug report"
3+
about: "Report a general issue, encountered while using Laradock."
4+
labels: "Type: Bug"
5+
---
6+
7+
### Description:
8+
<!-- A clear and concise description of what the bug is. -->
9+
10+
### Expected Behavior:
11+
<!-- A clear and concise description of what you expected to happen. -->
12+
13+
### Context information:
14+
15+
**Output of `git rev-parse HEAD`**
16+
17+
```
18+
{paste here}
19+
```
20+
21+
**Output of `docker version`**
22+
23+
```
24+
{paste here}
25+
```
26+
27+
**Output of `docker-compose version`**
28+
29+
```
30+
{paste here}
31+
```
32+
33+
**System info: Mac, Windows or Linux. Include which disto/version**
34+
35+
```
36+
{paste here}
37+
```
38+
39+
### Steps to reproduce the issue:
40+
<!--- How can we reproduce the issue? -->
41+
42+
1.
43+
2.
44+
3.
45+
46+
### Stacktrace & Additional info:
47+
48+
```
49+
{paste here}
50+
```

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Support question
4+
url: https://gitter.im/LaraDock/laradock
5+
about: 'This repository is only for reporting bugs. If you need help, get in touch with us via Gitter.'
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: "Feature request"
3+
about: "Suggest an idea for this project."
4+
labels: "Type: Feature Request"
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
9+
10+
**Describe the solution you'd like**
11+
<!-- A clear and concise description of what you want to happen. -->
12+
13+
**Describe alternatives you've considered**
14+
<!-- A clear and concise description of any alternative solutions or features you've considered. -->
15+
16+
**Additional context**
17+
<!-- Add any other context or screenshots about the feature request here. -->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
<!--- Thank you for contributing to Laradock -->
1+
## Description
2+
<!--- Describe your changes in detail -->
3+
<!--- If it fixes an open issue, please link to the issue here. -->
24

3-
##### I completed the 3 steps below:
5+
## Motivation and Context
6+
<!--- What problem does it solve, or what feature does it add? -->
47

5-
- [ ] I've read the [Contribution Guide](http://laradock.io/contributing).
6-
- [ ] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
7-
- [ ] I enjoyed my time contributing and making developer's life easier :)
8+
## Types of Changes
9+
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
10+
- [] Bug fix (non-breaking change which fixes an issue).
11+
- [] New feature (non-breaking change which adds functionality).
12+
- [] Breaking change (fix or feature that would cause existing functionality to not work as expected).
13+
14+
## Definition of Done Checklist:
15+
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
16+
- [] I've read the [Contribution Guide](http://laradock.io/contributing).
17+
- [] I've updated the **documentation**. (refer to [this](http://laradock.io/contributing/#update-the-documentation-site) for how to do so).
18+
- [] I enjoyed my time contributing and making developer's life easier :)

.github/SUPPORT.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Support Questions
2+
3+
For help, please visit our official chatting room on [Gitter](https://gitter.im/Laradock/laradock).

0 commit comments

Comments
 (0)