Merge branch 'develop' of https://github.com/frappe/frappe into refactor-website
This commit is contained in:
commit
b94ae962e2
2 changed files with 16 additions and 3 deletions
17
.github/workflows/ci-tests.yml
vendored
17
.github/workflows/ci-tests.yml
vendored
|
|
@ -144,8 +144,8 @@ jobs:
|
|||
DB: ${{ matrix.DB }}
|
||||
TYPE: ${{ matrix.TYPE }}
|
||||
|
||||
- name: Coverage
|
||||
if: matrix.TYPE == 'server'
|
||||
- name: Coverage - Pull Request
|
||||
if: matrix.TYPE == 'server' && github.event_name == 'pull_request'
|
||||
run: |
|
||||
cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
|
||||
cd ${GITHUB_WORKSPACE}
|
||||
|
|
@ -156,3 +156,16 @@ jobs:
|
|||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
|
||||
COVERALLS_SERVICE_NAME: github
|
||||
|
||||
- name: Coverage - Push
|
||||
if: matrix.TYPE == 'server' && github.event_name == 'push'
|
||||
run: |
|
||||
cp ~/frappe-bench/sites/.coverage ${GITHUB_WORKSPACE}
|
||||
cd ${GITHUB_WORKSPACE}
|
||||
pip install coveralls==2.2.0
|
||||
pip install coverage==4.5.4
|
||||
coveralls --service=github-actions
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}
|
||||
COVERALLS_SERVICE_NAME: github-actions
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ export default {
|
|||
frappe.msgprint(__('Invalid URL'));
|
||||
return Promise.reject();
|
||||
}
|
||||
|
||||
file_url = decodeURI(file_url)
|
||||
return this.upload_file({
|
||||
file_url
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue