Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
* master:
  Fix an install with the installer due to the cache created by composer
  Removed unused variable
  Update README.md
  • Loading branch information
REBELinBLUE committed Oct 9, 2015
2 parents 94a7ae4 + 547386d commit 3f3b8df
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ The `master` branch of this repository is a development branch and **should not*
2. Checkout the latest release

```shell
$ git checkout 0.0.19
$ git checkout 0.0.20
```

3. Install dependencies
Expand Down Expand Up @@ -93,7 +93,7 @@ The `master` branch of this repository is a development branch and **should not*

```shell
$ git fetch --all
$ git checkout 0.0.19
$ git checkout 0.0.20
```

2. Update the dependencies
Expand Down
2 changes: 2 additions & 0 deletions app/Console/Commands/InstallApp.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public function handle()
return;
}

$this->clearCaches();

// TODO: Add options so they can be passed in via the command line?
$config = base_path('.env');
Expand Down
4 changes: 2 additions & 2 deletions database/migrations/2015_10_06_083529_add_is_webhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public function up()
$table->boolean('is_webhook')->default(false);
});

$affected = DB::table('deployments')->whereRaw('user_id IS NULL')
->update(['is_webhook' => true]);
DB::table('deployments')->whereRaw('user_id IS NULL')
->update(['is_webhook' => true]);
}

/**
Expand Down

0 comments on commit 3f3b8df

Please sign in to comment.