Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase ci from master #93

Merged
merged 40 commits into from May 5, 2020
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
beceb3a
Add ci setup (#56)
jabranr Apr 19, 2020
348709a
Add ci setup (#57)
jabranr Apr 19, 2020
f28eacf
Update ci (#59)
jabranr Apr 19, 2020
4d3e7de
add homepage (#60)
jabranr Apr 19, 2020
48c0878
fix typos
jabranr Apr 19, 2020
bd5b1a3
Add data (#64)
jabranr Apr 19, 2020
04a33fd
fix links, resolve #63 (#65)
jabranr Apr 20, 2020
b8158d3
Revert "fix links, resolve #63 (#65)" (#67)
jabranr Apr 20, 2020
5b06c3e
fix links, resolve #63 (#68)
jabranr Apr 20, 2020
584f588
add data, resolves #26 (#66)
jabranr Apr 20, 2020
e9a5702
update title (#70)
jabranr Apr 20, 2020
1a0e52b
add helplines (#71)
jabranr Apr 20, 2020
99bc7e4
add helplines (#72)
jabranr Apr 20, 2020
38036dc
add data (#73)
jabranr Apr 20, 2020
a53c6b6
update netlify badge
jabranr Apr 20, 2020
2fe5754
add keyword meta to search results
jabranr Apr 20, 2020
cfea114
fix typo
jabranr Apr 20, 2020
95188aa
add sitemap
jabranr Apr 21, 2020
7cbb3c5
add data
jabranr Apr 27, 2020
ffdc9bb
fix name overflow
jabranr Apr 27, 2020
3ba2e94
add client routing fix
jabranr Apr 27, 2020
dab2d31
update copy
jabranr Apr 27, 2020
fe4acd3
Add data CTA (#80)
jabranr May 1, 2020
e5ce211
update rotation angle
jabranr May 1, 2020
253bb12
Merge branch 'master' into develop
jabranr May 1, 2020
cb3c15c
Update contribution messages (#82)
jabranr May 1, 2020
c537c66
add post deploy action (#83)
jabranr May 1, 2020
6c303e9
Dataset MVP release (#81) (#84)
jabranr May 2, 2020
38c94b2
update merge ci script (#86)
jabranr May 2, 2020
9a5da97
Merge branch 'master' into develop
jabranr May 2, 2020
0181156
Merge branch 'master' into develop
jabranr May 2, 2020
235c2bd
fetch all remotes
jabranr May 2, 2020
2545983
Merge branch 'master' into develop
jabranr May 2, 2020
9a62c5c
update branch remote
jabranr May 2, 2020
cf552e8
Merge branch 'master' into develop
jabranr May 2, 2020
37087fe
list branches
jabranr May 2, 2020
64bc219
Merge branch 'master' into develop
jabranr May 2, 2020
b6b22a2
remove post deploy merge
jabranr May 2, 2020
d7f98e9
Merge branch 'master' into develop
jabranr May 2, 2020
a0dd061
add github workflow
jabranr May 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions .github/workflows/main.yml
@@ -0,0 +1,15 @@
name: CI - Merge master into develop
on:
push:
branches:
- 'master'
jobs:
merge-branch:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Merge to develop branch
uses: devmasx/merge-branch@v1.1.0
with:
type: now
target_branch: 'develop'