Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com> Conflicts: README.md
orchestral · Aug 2, 2014 · d5c705d · d5c705d
2 parents e54449b + 3fdd36b
commit d5c705d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -3,11 +3,11 @@ Memory Component for Orchestra Platform 2
 
 Memory Component handles runtime configuration either using "in memory" Runtime or database using Cache, Fluent Query Builder or Eloquent ORM. Instead of just allowing static configuration to be used, Memory Component allow those configuration to be persistent in between request by utilising multiple data storage option either through cache or database.
 
-[![Latest Stable Version](https://poser.pugx.org/orchestra/memory/v/stable.png)](https://packagist.org/packages/orchestra/memory) 
-[![Total Downloads](https://poser.pugx.org/orchestra/memory/downloads.png)](https://packagist.org/packages/orchestra/memory) 
-[![Build Status](https://travis-ci.org/orchestral/memory.svg?branch=2.2)](https://travis-ci.org/orchestral/memory) 
-[![Coverage Status](https://coveralls.io/repos/orchestral/memory/badge.png?branch=2.2)](https://coveralls.io/r/orchestral/memory?branch=2.2) 
-[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/memory/badges/quality-score.png?b=2.2)](https://scrutinizer-ci.com/g/orchestral/memory/) 
+[![Latest Stable Version](https://poser.pugx.org/orchestra/memory/v/stable.png)](https://packagist.org/packages/orchestra/memory)
+[![Total Downloads](https://poser.pugx.org/orchestra/memory/downloads.png)](https://packagist.org/packages/orchestra/memory)
+[![Build Status](https://travis-ci.org/orchestral/memory.svg?branch=2.2)](https://travis-ci.org/orchestral/memory)
+[![Coverage Status](https://coveralls.io/repos/orchestral/memory/badge.png?branch=2.2)](https://coveralls.io/r/orchestral/memory?branch=2.2)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/orchestral/memory/badges/quality-score.png?b=2.2)](https://scrutinizer-ci.com/g/orchestral/memory/)
 
 ## Table of Content
 
@@ -58,9 +58,9 @@ Next add the service provider in `app/config/app.php`.
 
 ```php
 'providers' => array(
-	
+
 	// ...
-	
+
 	'Orchestra\Memory\MemoryServiceProvider',
 
 	'Orchestra\Memory\CommandServiceProvider',

diff --git a/docs/changes.md b/docs/changes.md
@@ -5,6 +5,10 @@ title: Memory Change Log
 
 ## Version 2.2 {#v2-2}
 
+### v2.2.2 {#v2-2-2}
+
+* Fixes mass assignment issue when using Eloquent driver.
+
 ### v2.2.1 {#v2-2-1}
 
 * Swap type-hint from `Illuminate\Cache\CacheManager` to `Illuminate\Cache\Repository` to slightly reduce tight-coupling to Laravel app.
@@ -25,6 +29,10 @@ title: Memory Change Log
 
 ## Version 2.1 {#v2-1}
 
+### v2.1.6 {#v2-1-6}
+
+* Fixes mass assignment issue when using Eloquent driver.
+
 ### v2.1.5 {#v2-1-5}
 
 * Swap type-hint from `Illuminate\Cache\CacheManager` to `Illuminate\Cache\Repository` to slightly reduce tight-coupling to Laravel app.

diff --git a/src/Memory/Model.php b/src/Memory/Model.php
@@ -10,4 +10,18 @@ class Model extends Eloquent
      * @var string
      */
     protected $table = 'orchestra_options';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = array('name', 'value');
+
+    /**
+     * Indicates if the model should be timestamped.
+     *
+     * @var bool
+     */
+    public $timestamps = false;
 }