Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TryGhost/Casper
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Mergifyio/Casper
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: mergify
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 5 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 3, 2022

  1. Add LinkedIn and GitHub 

    https://github.com/Automattic/social-logos/tree/master/svg-min
    @jd
    jd committed Oct 3, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    jd Julien Danjou
    GPG key ID: 611BA9508B78A5C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd63b22 View commit details

  2. ci: add automatic deploy

    @jd
    jd committed Oct 3, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    jd Julien Danjou
    GPG key ID: 611BA9508B78A5C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9642bd8 View commit details

  3. Remove Ghost link

    @jd
    jd committed Oct 3, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    jd Julien Danjou
    GPG key ID: 611BA9508B78A5C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1deb7f6 View commit details

  4. Hardcode Mergify URL in some places

    @jd
    jd committed Oct 3, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    jd Julien Danjou
    GPG key ID: 611BA9508B78A5C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7dfd690 View commit details

  5. Add CTA

    @jd
    jd committed Oct 3, 2022

    Verified

    This commit was signed with the committer’s verified signature.
    jd Julien Danjou
    GPG key ID: 611BA9508B78A5C2
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2d83489 View commit details
Showing with 37 additions and 4 deletions.
  1. +15 −0 .github/workflows/deploy-theme.yml
  2. +5 −4 default.hbs
  3. +1 −0 partials/icons/github.hbs
  4. +1 −0 partials/icons/linkedin.hbs
  5. +15 −0 post.hbs
15 changes: 15 additions & 0 deletions .github/workflows/deploy-theme.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Deploy Theme
on:
push:
branches:
- mergify
jobs:
deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: TryGhost/action-deploy-theme@v1.4.1
with:
api-url: ${{ secrets.GHOST_ADMIN_API_URL }}
api-key: ${{ secrets.GHOST_ADMIN_API_KEY }}
theme-name: "mergify-casper"
9 changes: 5 additions & 4 deletions default.hbs
View file
Original file line number Diff line number Diff line change
@@ -25,9 +25,9 @@
<nav class="gh-head-inner inner">

<div class="gh-head-brand">
<a class="gh-head-logo{{#unless @site.logo}} no-image{{/unless}}" href="{{@site.url}}">
<a class="gh-head-logo{{#unless @site.logo}} no-image{{/unless}}" href="https://mergify.com">
{{#if @site.logo}}
<img src="{{@site.logo}}" alt="{{@site.title}}" />
<img src="{{@site.logo}}" alt="Mergify" />
{{else}}
{{@site.title}}
{{/if}}
@@ -49,6 +49,8 @@
{{#if @site.twitter}}
<a class="gh-social-link gh-social-twitter" href="{{twitter_url @site.twitter}}" title="Twitter" target="_blank" rel="noopener">{{> "icons/twitter"}}</a>
{{/if}}
<a class="gh-social-link gh-social-gh" href="https://github.com/Mergifyio" target="_blank" rel="noopener">{{> "icons/github"}}</a>
<a class="gh-social-link gh-social-ln" href="https://linkedin.com/company/mergify" target="_blank" rel="noopener">{{> "icons/linkedin"}}</a>
</div>
{{#if @site.members_enabled}}
{{#unless @member}}
@@ -69,11 +71,10 @@
{{!-- The global footer at the very bottom of the screen --}}
<footer class="site-footer outer">
<div class="inner">
<section class="copyright"><a href="{{@site.url}}">{{@site.title}}</a> &copy; {{date format="YYYY"}}</section>
<section class="copyright"><a href="https://mergify.io">Mergify</a> &copy; {{date format="YYYY"}}</section>
<nav class="site-footer-nav">
{{navigation type="secondary"}}
</nav>
<div><a href="https://ghost.org/" target="_blank" rel="noopener">Powered by Ghost</a></div>
</div>
</footer>

1 change: 1 addition & 0 deletions partials/icons/github.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><rect x="0" fill="none" width="24" height="24"/><g><path d="M12 2C6.477 2 2 6.477 2 12c0 4.42 2.865 8.166 6.84 9.49.5.09.68-.22.68-.485 0-.236-.008-.866-.013-1.7-2.782.603-3.37-1.34-3.37-1.34-.454-1.156-1.11-1.464-1.11-1.464-.908-.62.07-.607.07-.607 1.004.07 1.532 1.03 1.532 1.03.89 1.53 2.34 1.09 2.91.833.09-.647.348-1.086.634-1.337-2.22-.252-4.555-1.112-4.555-4.944 0-1.09.39-1.984 1.03-2.682-.104-.254-.448-1.27.096-2.646 0 0 .84-.27 2.75 1.025.8-.223 1.654-.333 2.504-.337.85.004 1.705.114 2.504.336 1.91-1.294 2.748-1.025 2.748-1.025.546 1.376.202 2.394.1 2.646.64.7 1.026 1.59 1.026 2.682 0 3.84-2.337 4.687-4.565 4.935.36.307.68.917.68 1.852 0 1.335-.013 2.415-.013 2.74 0 .27.18.58.688.482C19.138 20.16 22 16.416 22 12c0-5.523-4.477-10-10-10z"/></g></svg>
1 change: 1 addition & 0 deletions partials/icons/linkedin.hbs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="currentColor"><path d="M19 0h-14c-2.761 0-5 2.239-5 5v14c0 2.761 2.239 5 5 5h14c2.762 0 5-2.239 5-5v-14c0-2.761-2.238-5-5-5zm-11 19h-3v-11h3v11zm-1.5-12.268c-.966 0-1.75-.79-1.75-1.764s.784-1.764 1.75-1.764 1.75.79 1.75 1.764-.783 1.764-1.75 1.764zm13.5 12.268h-3v-5.604c0-3.368-4-3.113-4 0v5.604h-3v-11h3v1.765c1.396-2.586 7-2.777 7 2.476v6.759z"/></svg>
15 changes: 15 additions & 0 deletions post.hbs
View file
Original file line number Diff line number Diff line change
@@ -86,6 +86,21 @@ into the {body} tag of the default.hbs template --}}
{{content}}
</section>

{{!-- Add box to try Mergify --}}
<div id="cta">
<div id="title">Ready to automate your GitHub workflow?</div>

<div id="subtitle">
We save your time by prioritizing and automatically merging, commenting,
rebasing, updating, labeling, backporting, closing, assigning,
your pull requests.
</div>

<div class="flex">
<a href="https://mergify.io" class="button primary">Try Mergify for free</a>
</div>
</div>

{{!--
<section class="article-comments gh-canvas">
If you want to embed comments, this is a good place to paste your code!