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

Merge staged into production #17

Merged
merged 2 commits into from
Mar 4, 2020
Merged

Merge staged into production #17

merged 2 commits into from
Mar 4, 2020

Conversation

janhoy
Copy link
Contributor

@janhoy janhoy commented Mar 4, 2020

Hide security warning box after 60 days.

@uschindler
Copy link
Contributor

Isn't this a duplicate?

@janhoy
Copy link
Contributor Author

janhoy commented Mar 4, 2020

Isn't this a duplicate?

Hehe, no, it is a PR to merge from master to production :)

@janhoy janhoy changed the title Put #15 in production Merge staged into production Mar 4, 2020
@janhoy
Copy link
Contributor Author

janhoy commented Mar 4, 2020

Added #17 as well, so we can merge both into production once validated in staging.

@janhoy
Copy link
Contributor Author

janhoy commented Mar 4, 2020

Ok, both the security warning box and the new downloads links look god in staged, will put it in production now.

@janhoy janhoy merged commit 10a6bef into production Mar 4, 2020
@uschindler
Copy link
Contributor

I am still confused: how did you create the PR from master -> production?

@janhoy
Copy link
Contributor Author

janhoy commented Mar 5, 2020

Just wanted to try another way to do the merge. But I think I like better the plain git checkout production && git pull && git merge master && git push :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants