Skip to content
This repository has been archived by the owner on Dec 2, 2019. It is now read-only.

Commit

Permalink
Merge pull request #12 from trendwerk/updates
Browse files Browse the repository at this point in the history
Updates
  • Loading branch information
haroldangenent authored Dec 1, 2016
2 parents a7171d8 + 3d066d6 commit 4737f46
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 37 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ web/.htaccess
web/app/debug.log
web/wp

# Capistrano
log/capistrano.log

# Dotenv
.env
!.env.example
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### HEAD

* Default `WP_ENV` to `production` instead of `development` ([#277](https://github.com/roots/bedrock/pull/277))

### 1.7.2: 2016-09-07

* Update to WordPress 4.6.1
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'

gem 'capistrano', '~> 3.2.0'
gem 'capistrano', '~> 3.6'
gem 'capistrano-composer'
gem 'capistrano-wpcli'
26 changes: 15 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
GEM
remote: https://rubygems.org/
specs:
capistrano (3.2.1)
airbrussh (1.1.1)
sshkit (>= 1.6.1, != 1.7.0)
capistrano (3.6.1)
airbrussh (>= 1.0.0)
capistrano-harrow
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
capistrano-composer (0.0.5)
sshkit (>= 1.9.0)
capistrano-composer (0.0.6)
capistrano (>= 3.0.0.pre)
capistrano-wpcli (0.0.9)
capistrano (>= 3.0)
colorize (0.7.5)
capistrano-harrow (0.5.3)
capistrano-wpcli (0.1.3)
capistrano (~> 3.6.0)
sshkit (~> 1.11.2)
i18n (0.7.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
rake (10.4.2)
sshkit (1.6.1)
colorize (>= 0.7.0)
net-ssh (3.2.0)
rake (11.3.0)
sshkit (1.11.4)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)

PLATFORMS
ruby

DEPENDENCIES
capistrano (~> 3.2.0)
capistrano (~> 3.6)
capistrano-composer
capistrano-wpcli
49 changes: 25 additions & 24 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/**
* Environment settings
*/
define('WP_ENV', env('WP_ENV') ? env('WP_ENV') : 'development');
define('WP_ENV', env('WP_ENV') ? env('WP_ENV') : 'production');
define('WP_HOME', env('WP_HOME'));
define('WP_SITEURL', env('WP_SITEURL') ? env('WP_SITEURL') : WP_HOME . '/wp');

Expand Down

0 comments on commit 4737f46

Please sign in to comment.