Skip to content

Commit

Permalink
Merge pull request #4 from stashapp/develop
Browse files Browse the repository at this point in the history
Merge with the latest Stash 0.21 develop
  • Loading branch information
philpw99 authored Aug 10, 2023
2 parents f79ff17 + 38a06be commit 66e79d1
Show file tree
Hide file tree
Showing 583 changed files with 27,967 additions and 12,182 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

# github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
github: stashapp
# patreon: # Replace with a single Patreon username
open_collective: stashapp
# ko_fi: # Replace with a single Ko-fi username
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Validate UI
# skip UI validation for pull requests if UI is unchanged
if: ${{ github.event_name != 'pull_request' || steps.cache-ui.outputs.cache-hit != 'true' }}
run: docker exec -t build /bin/bash -c "make validate-frontend"
run: docker exec -t build /bin/bash -c "make validate-ui"

# Static validation happens in the linter workflow in parallel to this workflow
# Run Dynamic validation here, to make sure we pass all the projects integration tests
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ node_modules
*.db

/stash
/phasher
dist
.DS_Store
/.local
/.local*
Loading

0 comments on commit 66e79d1

Please sign in to comment.