Skip to content

Commit

Permalink
Merge pull request #52 from DoESLiverpool/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
amcewen authored Dec 7, 2021
2 parents 30df8a2 + 120a158 commit 1d7189a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/deploy-to-production.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ jobs:
cd optimism
git pull
docker-compose build
docker-compose restart
docker-compose down
docker-compose start
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ The following commands are defined in package.json:
`npm run test` (or `npm tests` or `npm t`) runs .js files in the test subfolder. You can use one of the existing files e.g. app.test.js as a template (first set the NODE_ENV environment variable to 'testing' and run `npx knex install:latest` to use the latest version of the test database)
The `nodemon` commmand is used to monitor code changes in each of the website and api projects and restart these as required.
The `concurrently` command is used to start more than one command concurrently. The output from all the commands is sent to the same terminal and is prefixed with a name to identify output.
Expand Down
2 changes: 1 addition & 1 deletion website/templates/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h2>Some pages</h2>
</div>
<div class="col-md-4">
<h2>That might be</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor
<p>E ancora qualche altre parole. id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor
mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada
magna mollis euismod. Donec sed odio dui. </p>
<p><a class="btn btn-secondary" href="#" role="button">View details &raquo;</a></p>
Expand Down

0 comments on commit 1d7189a

Please sign in to comment.