Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add check for local config over dev config #1422

Merged
merged 1 commit into from
Jul 3, 2019
Merged

Conversation

belcherj
Copy link
Contributor

@belcherj belcherj commented Jul 1, 2019

Fix

Locally I want to have a git ignored config. This allows for a local config to be used.

Test

  1. Check out branch
  2. Run build
  3. Does build run?
  4. Copy /config.json to /config-local.json
  5. Run build
  6. Does build run?

Review

Only one developer is required to review these changes, but anyone can perform the review.

@belcherj belcherj requested a review from bummytime July 1, 2019 19:18
@belcherj belcherj self-assigned this Jul 1, 2019
@belcherj belcherj requested a review from mirka July 2, 2019 17:20
Copy link

@jleandroperez jleandroperez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Run build & Does build run?
✅ Copy /config.json to /config-local.json & Run build & Does build run?

Looking great on my end sir!

:shipit:

@belcherj belcherj merged commit 9a2f4e9 into develop Jul 3, 2019
@belcherj belcherj deleted the add/local-config-check branch July 3, 2019 13:49
belcherj pushed a commit that referenced this pull request Aug 12, 2019
* Aria Label (#1400)

* Added aria label for search field

* Update dependency react-transition-group to v4.2.0 (#1421)

* Update dependency concurrently to v4.1.1 (#1409)

* Update dependency @material-ui/core to v4.1.3 (#1381)

* Update dependency focus-visible to v5 (#1382)

* Update dependency babel-eslint to v10.0.2 (#1388)

* Update dependency eslint-config-prettier to v6 (#1408)

* Update dependency eslint-plugin-react to v7.14.2 (#1406)

* Update dependency eslint-plugin-jest to v22.7.1 (#1392)

* Update dependency webpack-cli to v3.3.5 (#1405)

* Fixes linting error (#1427)

* Update dependency babel-plugin-dynamic-import-node to v2.3.0 (#1390)

* Update dependency core-js to v3.1.4 (#1386)

* Add check for local config over deve config (#1422)

* Add deploy script and vip assets (#1429)

* Update dependency lodash to v4.17.13 [SECURITY] (#1444)

* Update dependency draft-js to v0.11.0 (#1443)

* Update dependency redux to v4.0.4 (#1441)

* Pin dependencies (#1445)

* added styles for both light and dark theme to highlight note and change colors for accessibility (#1402)

* Fix the develop build

* Remove simperium link from about page (#1450)

* Updates dark mode note list styling (#1452)

* Updates dark mode note list styling

* Switch blue background to grey for dark mode

* Update version for 1.7.0-beta1

* Fixes public path for electron

* Bump version to 1.7.0-beta2

* Bump version to 1.7.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants