Skip to content

Commit

Permalink
Merge pull request #91 from Financial-Times/branch-renaming-chores
Browse files Browse the repository at this point in the history
ACC-1169 main branch name change chores
  • Loading branch information
AniaMakes authored Sep 20, 2021
2 parents 116aa3f + ecf58a8 commit aecdc33
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ references:
restore_cache:
<<: *npm_cache_keys

filters_only_master: &filters_only_master
filters_only_main: &filters_only_main
branches:
only: master
only: main

filters_ignore_master: &filters_ignore_master
filters_ignore_main: &filters_ignore_main
branches:
ignore: master
ignore: main

filters_ignore_tags: &filters_ignore_tags
tags:
Expand Down Expand Up @@ -123,7 +123,7 @@ workflows:
- schedule:
cron: "0 0 * * *"
filters:
<<: *filters_only_master
<<: *filters_only_main
jobs:
- build:
context: next-nightly-build
Expand Down
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_extends: github-apps-config-next

branches:
- name: master
- name: main
protection:
required_pull_request_reviews: null
required_status_checks:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ The Content API has the property `canBeSyndicated` which is a string containing
## This is just some javascript - is there other code elsewhere?
Yep - These links will probably be wrong pretty soon but will hopefully point you in the right direction:

**n-teaser** - https://github.com/Financial-Times/n-teaser/blob/master/src/presenters/teaser-presenter.js#L77
**n-teaser** - https://github.com/Financial-Times/n-teaser/blob/main/src/presenters/teaser-presenter.js#L77
Here we add an additional modifier if syndication is available on this article

**next-article** - https://github.com/Financial-Times/next-article/blob/master/views/content.html#L20
**next-article** - https://github.com/Financial-Times/next-article/blob/main/views/content.html#L20
Here a data attribute is added containing the syndication status of the article.

**generic** - add the following data attributes to your markup:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Implementation for the syndication indicator, for users who subscribe to the new FT syndication platform",
"devDependencies": {
"@babel/runtime": "^7.10.2",
"@financial-times/n-gage": "^5.1.2",
"@financial-times/n-gage": "^8.3.2",
"@financial-times/n-heroku-tools": "^8.0.0",
"@sucrase/jest-plugin": "^2.0.0",
"autoprefixer": "^6.3.6",
Expand Down Expand Up @@ -59,4 +59,4 @@
"pre-push": "make verify -j3"
}
}
}
}

0 comments on commit aecdc33

Please sign in to comment.