turniere
/
turniere-backend
mirror of https://github.com/turniere/turniere-backend.git
1
0
Fork 0
Code Issues Releases Wiki Activity
515 Commits 84 Branches 0 Tags 1 MiB
Commit Graph

515 Commits

Author SHA1 Message Date
snyk-bot 1d49b1b2e5 fix: Gemfile to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-WEBSOCKETEXTENSIONS-570830
 2020-06-03 05:09:46 +00:00
Daniel Schädler b53ffd40af
Merge pull request #81 from turniere/ticket/TUR-18 
Login to push deploy container TUR-18
 2019-11-21 18:51:38 +01:00
Daniel Schädler 72da49806f Login to push deploy container 2019-11-21 18:40:41 +01:00
Daniel Schädler 0aad028bf0
Merge pull request #80 from turniere/ticket/TUR-18 
Push Container with :deploy on commits to master
 2019-11-21 17:52:57 +01:00
Daniel Schädler b8e2809e46 Push Container with :deploy on commits to master 2019-11-21 17:34:53 +01:00
Thor77 13b2b05cb6
Merge pull request #79 from turniere/ticket/TUR-17 
Update dependencies
 2019-11-20 12:44:07 +01:00
Daniel Schädler a1a9c2da2f Update dependencies 2019-11-20 10:16:50 +01:00
Thor77 6164e747fa
Merge pull request #78 from turniere/dependabot/bundler/rack-cors-1.0.5 
Bump rack-cors from 1.0.3 to 1.0.5
 2019-11-16 17:18:54 +01:00
dependabot[bot] 78cdaf80d1
Bump rack-cors from 1.0.3 to 1.0.5 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.3 to 1.0.5.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.3...v1.0.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-15 21:51:49 +00:00
Daniel Schädler aeaf5bcec6
Merge pull request #77 from turniere/dependabot/bundler/loofah-2.3.1 
Bump loofah from 2.2.3 to 2.3.1
 2019-11-11 15:42:59 +01:00
dependabot[bot] 043271860e
Bump loofah from 2.2.3 to 2.3.1 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.2.3 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.3...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-09 02:41:20 +00:00
Thor77 1598db7796
Merge pull request #76 from turniere/ticket/TUR-9 
Manually sort position of groups of 4 teams
 2019-11-09 00:42:42 +01:00
Daniel Schädler 1a96cefbc8 Guard clause to make Hound woof 2019-11-09 00:00:43 +01:00
Daniel Schädler 8c39fa9894 Manually sort position of groups of 4 teams 2019-11-08 23:51:23 +01:00
Daniel Schädler 0ded7bde1a
Merge pull request #75 from turniere/ticket/TUR-7 
Include parent group/stage in .index
 2019-11-06 20:52:34 +01:00
Thor77 28d047b1bf
Include parent group/stage in .index 2019-11-06 15:58:10 +01:00
Daniel Schädler b4418ffd5a
Merge pull request #74 from turniere/ticket/TUR-8 
Include team objects in /tournaments/:id/matches
 2019-11-06 13:04:45 +01:00
Thor77 5343fcbd20 Recurisvely include all related objects 2019-11-06 11:38:24 +01:00
Thor77 edd2649be0
Merge pull request #73 from turniere/ticket/TUR-5 
Migrate database to alpha
 2019-10-29 14:41:17 +01:00
Thor77 ab46e0acf2 Change database host, port, user and password 2019-10-29 14:28:07 +01:00
Daniel Schädler 5da941c002
Merge pull request #72 from turniere/ticket/TUR-2 
Implement Matches endpoint for tournament with filter
 2019-10-26 01:52:11 +02:00
Daniel Schädler 777ee95281 Readability +4 2019-10-26 01:38:06 +02:00
Daniel Schädler b8f8ffb411 More space for hound to be happy with 2019-10-26 01:35:46 +02:00
Daniel Schädler b37f510534 Unnecessary Variables 2019-10-26 01:35:00 +02:00
Daniel Schädler 400a396f00 Test match index controller with filter 2019-10-26 01:23:15 +02:00
Daniel Schädler 82e4ff90dc Test tournament.matches method 2019-10-26 01:22:52 +02:00
Daniel Schädler b001817bac Filter matches by state parameter 2019-10-26 00:34:04 +02:00
Daniel Schädler 33ccab8988 Return all matches also from groups 2019-10-26 00:32:14 +02:00
Daniel Schädler a6b7a905a0 Return matches as children of tournament 2019-10-25 23:49:27 +02:00
Daniel Schädler 77c76b7a31 Add matches method to tournament 
The method collects all matches from all stages
 2019-10-25 23:47:38 +02:00
Daniel Schädler eb2ddb3ce0
Merge pull request #71 from turniere/ticket/TUR-3 
Implement slim version of tournament endpoint
 2019-10-25 23:37:48 +02:00
Thor77 d317585168
Add "simple" parameter to tournament show 2019-10-25 23:17:08 +02:00
Daniel Schädler 46c903e109
Merge pull request #67 from turniere/ticket/TURNIERE-262 
Improve Docker Images (Ticket/turniere 262)
 2019-10-09 13:34:28 +02:00
Daniel Schädler fd8b93d386 Add Tags for use with shared runners 2019-10-09 12:44:46 +02:00
Daniel Schädler e79136e67b Add Docker related information to readme 2019-10-09 12:32:59 +02:00
Daniel Schädler 699b451f26 Explicitly define current commit sha as test image 2019-10-09 12:32:59 +02:00
Daniel Schädler 0f95124893 Remove not working docker tag commands 2019-10-09 12:32:59 +02:00
Daniel Schädler 5e559e1522 Revert Dockerfile to use latest version of image 
As it is built locally within one step and never pulled between steps,
this should not be a problem
 2019-10-09 12:32:59 +02:00
Daniel Schädler 7f2dc1f1c1 Manually retag pushed images locally 2019-10-09 12:32:59 +02:00
Daniel Schädler c22aafe037 Tag local versions of Docker Containers 
These are (hopefully) never pushed and therefore are always the most recent  version.
 2019-10-09 12:32:59 +02:00
Daniel Schädler d507f84dc8 Deploy newly renamed container 2019-10-09 12:32:59 +02:00
Daniel Schädler 4fa4b1e1f7 Enter app directory 
Otherwise bundler refuses to run and won't find rails or the tests.
 2019-10-09 12:32:59 +02:00
Daniel Schädler 3c280a6b29 Run tests in image built one step above using latest tag 
This isn't optimal since theoretically there could be an image pushed
just between building and downloading again, but variables cannot be
used within gitlab-ci.yml so that is what we have to work with. If
variables get introduced, we should lock this to the current commit sha.
 2019-10-09 12:32:59 +02:00
Daniel Schädler cffaafb6bd Swap build and test stage 2019-10-09 12:32:59 +02:00
Daniel Schädler 103ea70f9a Improve gitlab-ci.yml readability 2019-10-09 12:32:59 +02:00
Daniel Schädler 2fb0206798 Ignore coverage and docker folder in docker build 2019-10-09 12:32:59 +02:00
Daniel Schädler 2ba17a02a0 Add test & spec folder to docker container 
It would have been nicer to also exclude the test and spec folder within
the production container, saving some space within that, but the docker
COPY statement doesn't allow for that without a workaround. So this is
what we will do for now I guess.
 2019-10-09 12:32:59 +02:00
Daniel Schädler e6a4f88b24 Build development & test containers in GitLab 2019-10-09 12:32:59 +02:00
Daniel Schädler 3c9e159b16 Add test container Dockerfile 2019-10-09 12:32:59 +02:00
Daniel Schädler bbfb9a355b Add development container Dockerfile 2019-10-09 12:32:59 +02:00