ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,408 Commits 117 Branches 1,511 Tags
Commit Graph

16408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schäfer
2d346448b3 Use https for submodules to avoid SSH key exchange 2018-12-06 15:44:35 +01:00
Robert Schäfer
0243bfbec2 Start with a .travis.yml and cypress run 
Build failures are expected
 2018-12-06 15:26:07 +01:00
Robert Schäfer
b0bd5b8174 Coyp over files from webapp repository 2018-12-06 15:24:49 +01:00
Robert Schäfer
364fa73cc2
Fix merge accident 2018-12-06 15:22:25 +01:00
Robert Schäfer
7aa2befc94 Remove cypress.json (forgot that) 2018-12-06 15:20:47 +01:00
Robert Schäfer
6415426949 Merge remote-tracking branch 'origin/master' into integration-testing 2018-12-06 15:18:12 +01:00
Robert Schäfer
38f27743f2 Remove remains of cypress 
I love cypress already. However my suggestion is to create a separate
repository that includes `backend` and `web` run full stack tests from
there. It is possible to trigger builds in other repositories on Travis
CI. So here is my suggestion: We agree to have matching branch names in
all related repositories, so `branch-1` in repo `web`, `backend` and
`human-connection`.

As a start, the developer has to manually update the submodules in the
meta repository and trigger a build to run fullstack tests. In the
future we might automate this process by triggering builds in other
repos. That's possible on Travis CI, see:
https://docs.travis-ci.com/user/triggering-builds/

See each repository is responsible to keep their set of unit/integration
tests but the meta repository is responsible of carrying out full stack
testing.

@appinteractive your opinion?
 2018-12-06 15:15:33 +01:00
Robert Schäfer
cf48aa86d7 Update API and WebApp submodules 2018-12-06 14:55:45 +01:00
Robert Schäfer
75076b7d5a Add Nitro-Web and Nitro-Backend as submodules 2018-12-06 14:54:39 +01:00
dependabot[bot]
0d9322f601
Bump sanitize-html from 1.19.2 to 1.19.3 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.2 to 1.19.3.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.19.2...1.19.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 11:56:30 +00:00
Grzegorz Leoniec
4a8d3a67ad
Merge pull request #52 from Human-Connection/dependabot/npm_and_yarn/dotenv-6.2.0 
Bump dotenv from 6.1.0 to 6.2.0
 2018-12-06 12:52:21 +01:00
dependabot[bot]
c6cc461057
Bump dotenv from 6.1.0 to 6.2.0 
Bumps [dotenv](https://github.com/motdotla/dotenv) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v6.1.0...v6.2.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-06 04:48:26 +00:00
dependabot[bot]
d2d448f756
Merge pull request #70 from Human-Connection/dependabot/submodules/API-8ea42b5 2018-12-05 04:51:58 +00:00
dependabot[bot]
79d7b07765
Bump API from a64fff7 to 8ea42b5 
Bumps [API](https://github.com/Human-Connection/API) from `a64fff7` to `8ea42b5`.
- [Release notes](https://github.com/Human-Connection/API/releases)
- [Commits](a64fff79be...8ea42b5b40)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-05 04:51:32 +00:00
Robert Schäfer
03d7148958 Run the tests in the docker image 
Travis lags behind with the current version of docker-compose
 2018-12-05 00:37:18 +01:00
Grzegorz Leoniec
ee911b46f9
Merge branch 'master' into dependabot/docker/neo4j-3.5.0 2018-12-05 00:35:32 +01:00
Robert Schäfer
7df0a1bd97 Merge remote-tracking branch 'origin/master' into mochajs 2018-12-05 00:35:30 +01:00
Grzegorz Leoniec
32dec7bac6
Merge pull request #47 from Human-Connection/dependabot/npm_and_yarn/sanitize-html-1.19.2 
Bump sanitize-html from 1.19.1 to 1.19.2
 2018-12-05 00:34:44 +01:00
Robert Schäfer
ad62a8ebb3 Set unimplemented mocha tests to pending 2018-12-05 00:18:47 +01:00
Robert Schäfer
1ae09b5a7f Merge remote-tracking branch 'origin/master' into mochajs 2018-12-05 00:12:42 +01:00
dependabot[bot]
7623b4dc85
Bump sanitize-html from 1.19.1 to 1.19.2 
Bumps [sanitize-html](https://github.com/punkave/sanitize-html) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/punkave/sanitize-html/releases)
- [Changelog](https://github.com/punkave/sanitize-html/blob/master/CHANGELOG.md)
- [Commits](https://github.com/punkave/sanitize-html/compare/1.19.1...1.19.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 22:56:53 +00:00
Robert Schäfer
3ef98dab84 Merge remote-tracking branch 'origin/master' into tagged_deployments 2018-12-04 23:53:17 +01:00
Robert Schäfer
62e3ba9ff2
Merge pull request #40 from Human-Connection/use_docker_compose_on_travis_for_testing 
Run seeds and eslint on Travis CI
 2018-12-04 23:52:49 +01:00
Robert Schäfer
698b1bb218
Merge branch 'master' into use_docker_compose_on_travis_for_testing 2018-12-04 23:48:59 +01:00
Robert Schäfer
43b5d8eeb0 Follow @appinteractives review 
See:
https://github.com/Human-Connection/Nitro-Backend/pull/40#pullrequestreview-180898363
https://github.com/Human-Connection/Nitro-Backend/pull/40#pullrequestreview-180950115
 2018-12-04 23:43:19 +01:00
Robert Schäfer
8f42a18729
Merge pull request #69 from Human-Connection/dependabot/npm_and_yarn/eslint-plugin-vue-5.0.0 
Bump eslint-plugin-vue from 4.7.1 to 5.0.0
 2018-12-04 23:17:40 +01:00
Robert Schäfer
f250c60fc9
Merge pull request #43 from Mastercuber/kubernetes-readme 
Add troubleshoot to kubernetes README
 2018-12-04 22:37:36 +01:00
JB
56ed20f3bf Use kebab-case for components in templates 2018-12-04 22:02:15 +01:00
Robert Schäfer
71c4ffb012 Merge remote-tracking branch 'origin/master' into mochajs 2018-12-04 21:35:45 +01:00
Grzegorz Leoniec
34817378a4
Merge branch 'master' into locations 2018-12-04 21:32:54 +01:00
dependabot[bot]
05dcfab27a
Bump eslint-plugin-vue from 4.7.1 to 5.0.0 
Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 4.7.1 to 5.0.0.
- [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases)
- [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v4.7.1...v5.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 04:36:22 +00:00
Armin Kunkel
d355974b6e Add troubleshoot to kubernetes README 2018-12-04 03:52:33 +01:00
Robert Schäfer
0fab314b13 Wording: Use reset-db for the file name, too 
FYI: @Mastercuber
 2018-12-04 01:20:50 +01:00
Robert Schäfer
8e462e9cc6 Typo: tagS to deploy only if git tag exists 2018-12-04 01:02:21 +01:00
Robert Schäfer
eb29311cbb Copy+paste deployment configuration from backend 
See these commits:
5eae8a89785798519aec66fb708389f6e5ea0327
1b8edc22ff8b900c45486b815a8c9d4465e7edb7
 2018-12-04 01:01:28 +01:00
Robert Schäfer
5eae8a8978 Configure Travis CI conditional builds 
and add placeholder deployment. This commit should deploy to

* `production` if on branch master AND tagged
* `staging` if on branch master
* `custom` if tagged

The custom deployment is inspired by https://zeit.co/now and should
deploy features for demonstration purposes before merging into master.

It will happen that we trigger multiple deployments with this workflow:
If we deploy to production, that is going to deploy to a custom
environment and to staging. But I think this is not too problematic.

What do you think @appinteractive @mcwimpy?
 2018-12-04 00:24:26 +01:00
Robert Schäfer
fa8cbba421 Copy .env.template for dummy secrets on Travis 2018-12-03 20:49:23 +01:00
Robert Schäfer
d201d73670 Run seeds without docker-compose 
I give up with running docker-compose on Travis CI. Using `bash` instead
of Linux alpine's `sh` does **not** fix the issue as suggested here:
https://github.com/kimmobrunfeldt/concurrently/issues/104
 2018-12-03 20:43:42 +01:00
Robert Schäfer
f1c3c6bede Wording: no-auth-server instead of backdoor 
Suggested by @appinteractive
 2018-12-03 20:43:16 +01:00
Robert Schäfer
d061348ec8 Use npm: prefixes to DRY package.json 
@appinteractive and @Mastercuber have a look, I guess this feature of
concurrently is new to you: https://www.npmjs.com/package/concurrently#usage

For some reason, concurrently hangs when run with docker-compose. I
haven't figured out how to fix this. Run locally, everything terminates
as expected.
 2018-12-03 19:28:42 +01:00
Robert Schäfer
298db35546 Use simple past and consistend naming 2018-12-03 19:04:45 +01:00
Robert Schäfer
a7b4b55b6c Follow up to @appinteractive's commit e2f7bc51 
Next time: `git grep "backend"` 👍
 2018-12-03 18:57:53 +01:00
Robert Schäfer
333f181161 Fix typo in .travis.yml 2018-12-03 18:31:46 +01:00
Robert Schäfer
2ace3e5ce8 Disable eslint for the always-true if-condition 
See: https://github.com/Human-Connection/Nitro-Backend/issues/41
 2018-12-03 18:28:34 +01:00
Robert Schäfer
f00dbb67df Re-add success notification on Discord 
Why was it disabled in the first place @appinteractive?
 2018-12-03 18:06:08 +01:00
Robert Schäfer
15d9178369 Install and configure eslint 
Fix all violations but one - there is a mock in our authentication.
 2018-12-03 18:05:28 +01:00
Robert Schäfer
0bfe880c21 Use docker-compose for testing on Travis CI 
Currently running
* seeds
* eslint
 2018-12-03 17:28:53 +01:00
Robert Schäfer
61d252177a
Merge pull request #15 from Mastercuber/unseed-db 
Add unseeder
 2018-12-03 17:20:32 +01:00
Robert Schäfer
66b12f28b8
Wording: unseed does not exist but clean 2018-12-03 17:16:41 +01:00
Armin Kunkel
b5ce0351c7 Add yarn db:reset script 2018-12-03 15:38:08 +01:00