mirror of
https://github.com/wger-project/flutter.git
synced 2026-02-18 23:42:00 +01:00
Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts: # lib/models/workouts/log.dart # test/gallery/gallery_screen_test.mocks.dart # test/measurements/measurement_categories_screen_test.mocks.dart # test/measurements/measurement_provider_test.mocks.dart # test/nutrition/nutritional_plan_form_test.mocks.dart # test/other/base_provider_test.mocks.dart # test/workout/workout_form_test.mocks.dart # test/workout/workout_set_form_test.mocks.dart
This commit is contained in:
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -11,7 +11,7 @@ on:
|
||||
- 'pubspec.yaml'
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
|
||||
|
||||
15
.github/workflows/dependabot.yml
vendored
15
.github/workflows/dependabot.yml
vendored
@@ -1,15 +0,0 @@
|
||||
name: Dependabot Pub
|
||||
|
||||
on: workflow_dispatch
|
||||
|
||||
jobs:
|
||||
pub:
|
||||
name: Dependabot Pub
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: dart-lang/setup-dart@v1
|
||||
- name: Update
|
||||
uses: IchordeDionysos/dependabot-pub-runner@main
|
||||
with:
|
||||
path: /
|
||||
Reference in New Issue
Block a user