Compare commits

...

49 Commits

Author SHA1 Message Date
7fc920cddd Bump version number
Some checks reported errors
continuous-integration/drone/push Build was killed
continuous-integration/drone/tag Build is pending
2019-11-08 17:17:55 +01:00
c1ea45d517 Merge pull request #68 from vbrandl/dependabot/cargo/reqwest-0.9.22
Some checks reported errors
continuous-integration/drone/push Build was killed
Bump reqwest from 0.9.20 to 0.9.22
2019-10-14 15:37:50 +02:00
0b729da42f Merge pull request #65 from vbrandl/dependabot/cargo/actix-web-1.0.8
Bump actix-web from 1.0.7 to 1.0.8
2019-10-14 15:37:35 +02:00
c0d0aa2176 Bump reqwest from 0.9.20 to 0.9.22
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.9.20 to 0.9.22.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/v0.9.22/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.9.20...v0.9.22)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-14 13:35:53 +00:00
41159c4ba4 Merge pull request #63 from vbrandl/dependabot/cargo/serde-1.0.101
Bump serde from 1.0.100 to 1.0.101
2019-10-14 15:34:09 +02:00
b40b6bcad2 Bump serde from 1.0.100 to 1.0.101
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.100 to 1.0.101.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.100...v1.0.101)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-14 13:31:42 +00:00
6e86f49585 Merge pull request #67 from vbrandl/dependabot/cargo/serde_json-1.0.41
Bump serde_json from 1.0.40 to 1.0.41
2019-10-14 15:29:52 +02:00
c8c73b6b83 Bump serde_json from 1.0.40 to 1.0.41
Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.40 to 1.0.41.
- [Release notes](https://github.com/serde-rs/json/releases)
- [Commits](https://github.com/serde-rs/json/compare/v1.0.40...v1.0.41)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-14 13:25:55 +00:00
c6cc956f4d Merge pull request #69 from vbrandl/dependabot/cargo/structopt-0.3.3
Bump structopt from 0.3.1 to 0.3.3
2019-10-14 15:23:19 +02:00
e37489d2cb Merge pull request #62 from vbrandl/dependabot/cargo/serde_derive-1.0.101
Bump serde_derive from 1.0.100 to 1.0.101
2019-10-14 15:21:43 +02:00
8246be996e Bump structopt from 0.3.1 to 0.3.3
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.3.1 to 0.3.3.
- [Release notes](https://github.com/TeXitoi/structopt/releases)
- [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TeXitoi/structopt/compare/v0.3.1...v0.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 05:01:25 +00:00
1f32f3eda4 Bump actix-web from 1.0.7 to 1.0.8
Bumps [actix-web](https://github.com/actix/actix-web) from 1.0.7 to 1.0.8.
- [Release notes](https://github.com/actix/actix-web/releases)
- [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md)
- [Commits](https://github.com/actix/actix-web/compare/web-v1.0.7...web-v1.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-26 04:24:19 +00:00
ab6c317241 Bump serde_derive from 1.0.100 to 1.0.101
Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.100 to 1.0.101.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.100...v1.0.101)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-17 04:23:34 +00:00
1223d429db Merge pull request #60 from vbrandl/vbrandl-patch-1
All checks were successful
continuous-integration/drone/push Build is passing
Add Github actions
2019-09-09 21:39:32 +02:00
9613aa7848 Add Github actions 2019-09-09 21:39:16 +02:00
334fa8ced5 Bump version number
All checks were successful
continuous-integration/drone/push Build is passing
2019-09-09 18:19:53 +02:00
062343dd32 Merge pull request #57 from vbrandl/dependabot/cargo/serde-1.0.100
Bump serde from 1.0.99 to 1.0.100
2019-09-09 18:18:15 +02:00
bdb2a151fa Merge pull request #56 from vbrandl/dependabot/cargo/futures-0.1.29
Bump futures from 0.1.28 to 0.1.29
2019-09-09 18:17:04 +02:00
7e66393966 Bump serde from 1.0.99 to 1.0.100
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.99 to 1.0.100.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.99...v1.0.100)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 16:16:33 +00:00
32ac5ca0d8 Merge pull request #58 from vbrandl/dependabot/cargo/structopt-0.3.1
Bump structopt from 0.2.18 to 0.3.1
2019-09-09 18:15:19 +02:00
b3b4cd0e42 Merge pull request #59 from vbrandl/dependabot/cargo/serde_derive-1.0.100
Bump serde_derive from 1.0.99 to 1.0.100
2019-09-09 18:15:07 +02:00
be08b87bbb Bump serde_derive from 1.0.99 to 1.0.100
Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.99 to 1.0.100.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.99...v1.0.100)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 04:25:47 +00:00
cf4d427b96 Bump structopt from 0.2.18 to 0.3.1
Bumps [structopt](https://github.com/TeXitoi/structopt) from 0.2.18 to 0.3.1.
- [Release notes](https://github.com/TeXitoi/structopt/releases)
- [Changelog](https://github.com/TeXitoi/structopt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TeXitoi/structopt/compare/v0.2.18...v0.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-09 04:25:23 +00:00
b5ebc54372 Bump futures from 0.1.28 to 0.1.29
Bumps [futures](https://github.com/rust-lang-nursery/futures-rs) from 0.1.28 to 0.1.29.
- [Release notes](https://github.com/rust-lang-nursery/futures-rs/releases)
- [Changelog](https://github.com/rust-lang-nursery/futures-rs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang-nursery/futures-rs/compare/0.1.28...0.1.29)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 04:23:07 +00:00
231741629e Merge pull request #53 from vbrandl/dependabot/cargo/actix-web-1.0.7
All checks were successful
continuous-integration/drone/push Build is passing
Bump actix-web from 1.0.5 to 1.0.7
2019-08-30 11:22:26 +02:00
135c5756b1 Merge pull request #54 from vbrandl/dependabot/cargo/ructe-0.7.2
Bump ructe from 0.7.0 to 0.7.2
2019-08-30 11:21:07 +02:00
79cfee5fa5 Bump ructe from 0.7.0 to 0.7.2
Bumps [ructe](https://github.com/kaj/ructe) from 0.7.0 to 0.7.2.
- [Release notes](https://github.com/kaj/ructe/releases)
- [Commits](https://github.com/kaj/ructe/compare/v0.7.0...v0.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-29 04:27:17 +00:00
1c9b5db4e1 Bump actix-web from 1.0.5 to 1.0.7
Bumps [actix-web](https://github.com/actix/actix-web) from 1.0.5 to 1.0.7.
- [Release notes](https://github.com/actix/actix-web/releases)
- [Changelog](https://github.com/actix/actix-web/blob/master/CHANGES.md)
- [Commits](https://github.com/actix/actix-web/compare/web-v1.0.5...web-v1.0.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-29 04:26:47 +00:00
6e0e452395 Bump version number
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2019-08-28 20:21:56 +02:00
9e44731650 Merge pull request #50 from vbrandl/dependabot/cargo/reqwest-0.9.20
Bump reqwest from 0.9.19 to 0.9.20
2019-08-28 20:20:37 +02:00
f673d71387 Bump reqwest from 0.9.19 to 0.9.20
Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.9.19 to 0.9.20.
- [Release notes](https://github.com/seanmonstar/reqwest/releases)
- [Changelog](https://github.com/seanmonstar/reqwest/blob/v0.9.20/CHANGELOG.md)
- [Commits](https://github.com/seanmonstar/reqwest/compare/v0.9.19...v0.9.20)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 18:20:05 +00:00
eda1822dce Merge pull request #51 from vbrandl/dependabot/cargo/lazy_static-1.4.0
Bump lazy_static from 1.3.0 to 1.4.0
2019-08-28 20:18:56 +02:00
fb64af3456 Bump lazy_static from 1.3.0 to 1.4.0
Bumps [lazy_static](https://github.com/rust-lang-nursery/lazy-static.rs) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/rust-lang-nursery/lazy-static.rs/releases)
- [Commits](https://github.com/rust-lang-nursery/lazy-static.rs/compare/1.3.0...1.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 18:18:32 +00:00
0837284798 Merge pull request #48 from vbrandl/dependabot/cargo/serde-1.0.99
Bump serde from 1.0.98 to 1.0.99
2019-08-28 20:18:24 +02:00
a7039f15b5 Merge pull request #52 from vbrandl/dependabot/cargo/spin-0.5.2
[Security] Bump spin from 0.5.0 to 0.5.2
2019-08-28 20:16:54 +02:00
b1be281982 [Security] Bump spin from 0.5.0 to 0.5.2
Bumps [spin](https://github.com/mvdnes/spin-rs) from 0.5.0 to 0.5.2. **This update includes a security fix.**
- [Release notes](https://github.com/mvdnes/spin-rs/releases)
- [Commits](https://github.com/mvdnes/spin-rs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 17:22:32 +00:00
2795995f58 Bump serde from 1.0.98 to 1.0.99
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.98 to 1.0.99.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.98...v1.0.99)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 07:43:01 +00:00
913cc9dc75 Merge pull request #47 from vbrandl/dependabot/cargo/serde_derive-1.0.99
Bump serde_derive from 1.0.98 to 1.0.99
2019-08-28 09:27:35 +02:00
645d6e4a2b Bump serde_derive from 1.0.98 to 1.0.99
Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.98 to 1.0.99.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.98...v1.0.99)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-28 07:23:42 +00:00
e455a89de4 Fix Docker TLS certdir
All checks were successful
continuous-integration/drone/push Build is passing
2019-08-28 09:14:17 +02:00
f2cae46624 Update CI script for new docker version
All checks were successful
continuous-integration/drone/push Build is passing
2019-08-02 15:14:31 +02:00
f47cbbe81a Merge pull request #44 from vbrandl/dependabot/cargo/serde_derive-1.0.98
All checks were successful
continuous-integration/drone/push Build is passing
Bump serde_derive from 1.0.97 to 1.0.98
2019-08-02 15:01:12 +02:00
85f90c0bdb Bump serde_derive from 1.0.97 to 1.0.98
Bumps [serde_derive](https://github.com/serde-rs/serde) from 1.0.97 to 1.0.98.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.97...v1.0.98)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-02 13:00:35 +00:00
9143e5dbf8 Merge pull request #45 from vbrandl/dependabot/cargo/serde-1.0.98
Bump serde from 1.0.97 to 1.0.98
2019-08-02 14:59:02 +02:00
865e3c7bbd Merge pull request #46 from vbrandl/dependabot/cargo/log-0.4.8
Bump log from 0.4.7 to 0.4.8
2019-08-02 14:58:53 +02:00
5ebdd4067c Bump version number
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2019-07-29 21:50:21 +02:00
55a1405e71 Enable NormalizePath middleware
This allows double slashes in paths
2019-07-29 21:49:25 +02:00
1436336b6a Bump log from 0.4.7 to 0.4.8
Bumps [log](https://github.com/rust-lang/log) from 0.4.7 to 0.4.8.
- [Release notes](https://github.com/rust-lang/log/releases)
- [Changelog](https://github.com/rust-lang-nursery/log/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/log/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 04:34:22 +00:00
5a74306e49 Bump serde from 1.0.97 to 1.0.98
Bumps [serde](https://github.com/serde-rs/serde) from 1.0.97 to 1.0.98.
- [Release notes](https://github.com/serde-rs/serde/releases)
- [Commits](https://github.com/serde-rs/serde/compare/v1.0.97...v1.0.98)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 04:33:55 +00:00
5 changed files with 297 additions and 295 deletions

15
.github/workflows/rust.yml vendored Normal file
View File

@ -0,0 +1,15 @@
name: Rust
on: [push]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Build
run: cargo build --verbose
- name: Run tests
run: cargo test --verbose

View File

@ -1,6 +1,6 @@
image: docker:stable image: docker:19.03
services: services:
- docker:dind - docker:19.03-dind
stages: stages:
- build - build
@ -9,6 +9,8 @@ stages:
variables: variables:
DOCKER_HOST: tcp://docker:2375 DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
# DOCKER_TLS_CERTDIR: "/certs"
DOCKER_TLS_CERTDIR: ""
CONTAINER_BUILDER_IMAGE: $CI_REGISTRY_IMAGE:builder-latest CONTAINER_BUILDER_IMAGE: $CI_REGISTRY_IMAGE:builder-latest
CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG CONTAINER_TEST_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest

548
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,27 +1,27 @@
[package] [package]
name = "hoc" name = "hoc"
version = "0.11.0" version = "0.11.4"
authors = ["Valentin Brandl <vbrandl@riseup.net>"] authors = ["Valentin Brandl <vbrandl@riseup.net>"]
edition = "2018" edition = "2018"
build = "build.rs" build = "build.rs"
[dependencies] [dependencies]
actix-web = "1.0.5" actix-web = "1.0.8"
badge = "0.2.0" badge = "0.2.0"
bytes = "0.4.12" bytes = "0.4.12"
futures = "0.1.28" futures = "0.1.29"
git2 = "0.9.1" git2 = "0.9.1"
lazy_static = "1.3.0" lazy_static = "1.4.0"
log = "0.4.7" log = "0.4.8"
log4rs = "0.8.3" log4rs = "0.8.3"
number_prefix = "0.3.0" number_prefix = "0.3.0"
openssl-probe = "0.1.2" openssl-probe = "0.1.2"
reqwest = "0.9.19" reqwest = "0.9.22"
serde = "1.0.97" serde = "1.0.101"
serde_derive = "1.0.97" serde_derive = "1.0.101"
serde_json = "1.0.40" serde_json = "1.0.41"
structopt = "0.2.18" structopt = "0.3.3"
[build-dependencies] [build-dependencies]
ructe = "0.7.0" ructe = "0.7.2"
vergen = "3.0.4" vergen = "3.0.4"

View File

@ -355,6 +355,7 @@ fn start_server() -> Result<()> {
App::new() App::new()
.data(state.clone()) .data(state.clone())
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
.wrap(middleware::NormalizePath)
.service(index) .service(index)
.service(css) .service(css)
.service(favicon32) .service(favicon32)