Skip to content

Commit

Permalink
v1.2.1 (#8)
Browse files Browse the repository at this point in the history
* Add .gitattributes file

* Fix bug in publishing config

* Update changelog and docs
  • Loading branch information
tobytwigger authored Mar 18, 2020
1 parent ece0a7e commit 9e1a890
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 4 deletions.
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
* text=auto

/.github export-ignore
/docs export-ignore
/tests export-ignore
.gitattributes export-ignore
.gitignore export-ignore
CHANGELOG.md export-ignore
CODE_OF_CONDUCT.md export-ignore
CONTRIBUTING.md export-ignore
phpunit.xml export-ignore
Doxyfile export-ignore
doxygen-filters.php export-ignore
composer.lock export-ignore
1 change: 0 additions & 1 deletion .phpunit.result.cache

This file was deleted.

11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [1.2.1] - (18/03/2020)

### Added
- .gitattributes file

### Fixed
- Reference correct config file when publishing

## [1.2] - (04/02/2020)

### Changed
Expand Down Expand Up @@ -48,7 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- model/repository contracts


[Unreleased]: https://github.com/bristol-su/control/compare/v1.2...HEAD
[Unreleased]: https://github.com/bristol-su/control/compare/v1.2.1...HEAD
[1.2.1]: https://github.com/bristol-su/control/compare/v1.2...v1.2.1
[1.2]: https://github.com/bristol-su/control/compare/v1.1...v1.2
[1.1]: https://github.com/bristol-su/control/compare/v1.0.2...v1.1
[1.0.2]: https://github.com/bristol-su/control/compare/v1.0.1...v1.0.2
Expand Down
2 changes: 1 addition & 1 deletion docs/ControlDBServiceProvider_8php_source.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/ControlDBServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function boot()
*/
protected function registerConfig()
{
$this->publishes([__DIR__ .'/../config/config.php' => config_path('control.php'),
$this->publishes([__DIR__ .'/../config/control.php' => config_path('control.php'),
], 'config');
$this->mergeConfigFrom(
__DIR__ .'/../config/control.php', 'control'
Expand Down

0 comments on commit 9e1a890

Please sign in to comment.