Skip to content

Commit

Permalink
Merge branch 'master' of github.com:facade/ignition
Browse files Browse the repository at this point in the history
  • Loading branch information
freekmurze committed Sep 3, 2019
2 parents 9bd4d37 + abd7906 commit 79b1b6a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to `ignition` will be documented in this file

## 1.4.1 - 2019-09-03

- Change `remote-sites-path` and `local-sites-path` config keys to us snake case

## 1.4.0 - 2019-09-03

- add `enable_runnable_solutions` key to config file
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Ignition
# Ignition: a beautiful error page for Laravel apps

[![Latest Version on Packagist](https://img.shields.io/packagist/v/facade/ignition.svg?style=flat-square)](https://packagist.org/packages/facade/ignition)
[![Build Status](https://img.shields.io/travis/facade/ignition/master.svg?style=flat-square)](https://travis-ci.org/facade/ignition)
[![Quality Score](https://img.shields.io/scrutinizer/g/facade/ignition.svg?style=flat-square)](https://scrutinizer-ci.com/g/facade/ignition)
[![StyleCI](https://github.styleci.io/repos/204472210/shield?branch=master)](https://github.styleci.io/repos/204472210)
[![Total Downloads](https://img.shields.io/packagist/dt/facade/ignition.svg?style=flat-square)](https://packagist.org/packages/facade/ignition)

Ignition offers you a beautiful, customizable error screen. It also allows you to share your errors to Flare publicly.
Ignition offers you a beautiful, customizable error page. It also allows you to share your errors to Flare publicly.
If configured with a valid Flare API key, it will send errors to a project in your Flare account.

![Screenshot of ignition](https://facade.github.io/ignition/screenshot.png)
Expand Down
8 changes: 4 additions & 4 deletions config/ignition.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,16 @@
| Leaving either one, or both of these, empty or null will not trigger the
| remote URL changes, and will treat your editor links as local files.
|
| 'remote-sites-path' is the full base path of your sites or projects inside
| 'remote_sites_path' is the full base path of your sites or projects inside
| homestead, Docker, or remote dev servers, for example
| `/home/vagrant/Code`.
| 'local-sites-path' is the full base path of your sites or projects on your
| 'local_sites_path' is the full base path of your sites or projects on your
| local computer that your IDE or editor is running on,
| for example `/Users/<name>/Code` or
| `C:\Users\<name>\Documents\Code`.
*/

'remote-sites-path' => env('IGNITION_REMOTE_SITES_PATH', ''),
'local-sites-path' => env('IGNITION_LOCAL_SITES_PATH', ''),
'remote_sites_path' => env('IGNITION_REMOTE_SITES_PATH', ''),
'local_sites_path' => env('IGNITION_LOCAL_SITES_PATH', ''),

];
4 changes: 2 additions & 2 deletions resources/compiled/ignition.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/IgnitionConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ public function getEditor(): ?string

public function getRemoteSitesPath(): ?string
{
return Arr::get($this->options, 'remote-sites-path');
return Arr::get($this->options, 'remote_sites_path');
}

public function getLocalSitesPath(): ?string
{
return Arr::get($this->options, 'local-sites-path');
return Arr::get($this->options, 'local_sites_path');
}

public function getTheme(): ?string
Expand Down
2 changes: 1 addition & 1 deletion tests/IgnitionConfigTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ public function it_prioritizes_config_value_over_debug_mode()

$this->assertFalse($config->getEnableRunnableSolutions());
}
}
}

0 comments on commit 79b1b6a

Please sign in to comment.