nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2018-06-30 23:27:39 +02:00
commit 9ff1646cbb
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -16,6 +16,7 @@
## Refactor ## Refactor
## Bug fixes ## Bug fixes
* Add compatibility with macOS to `script/configure_bundler` [#7830](https://github.com/diaspora/diaspora/pull/7830)
## Features ## Features

3
script/configure_bundler
View file

@ -2,6 +2,7 @@
# frozen_string_literal: true # frozen_string_literal: true
require_relative "../config/bundler_helper" require_relative "../config/bundler_helper"
require "etc"
rails_env = BundlerHelper.rails_env rails_env = BundlerHelper.rails_env
database = BundlerHelper.database database = BundlerHelper.database
@ -13,7 +14,7 @@ def config(option)
system("#{File.join(__dir__, '../bin/bundle')} config --local #{option}") system("#{File.join(__dir__, '../bin/bundle')} config --local #{option}")
end end
config("jobs #{`nproc`}") config("jobs #{Etc.nprocessors}")
config("with #{database}") config("with #{database}")
if rails_env == "production" if rails_env == "production"