Skip to content

Commit fa4461f

Browse files
committed
replace references to 'master' with 'main'
1 parent 38a59ce commit fa4461f

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Build + Test
2-
on: [pull_request]
2+
on: [pull_request, push]
33

44
jobs:
55
build:
@@ -10,14 +10,15 @@ jobs:
1010
ruby: [ '2.4', '2.5', '2.6' ]
1111

1212
steps:
13-
- uses: actions/checkout@master
13+
- uses: actions/checkout@v2
1414
- name: Set up Ruby ${{ matrix.ruby }}
1515
uses: actions/setup-ruby@v1
1616
with:
17-
ruby-version: ${{ matrix.ruby }}
17+
ruby-version: ${{ matrix.ruby }}
1818
- name: Build and test with Rake
1919
run: |
2020
gem install bundler
2121
bundle install --jobs 4 --retry 3 --without guard
2222
bundle exec rspec spec
23-
bundle exec rubocop
23+
bundle exec rubocop
24+

.github/workflows/sync.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# This workflow ensures the "master" branch is always up-to-date with the
2+
# "main" branch (our default one)
3+
name: sync_main_branch
4+
on:
5+
push:
6+
branches: [ main ]
7+
jobs:
8+
catch_up:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Check out the repository
12+
uses: actions/checkout@v2
13+
with:
14+
fetch-depth: 0
15+
- name: Merge development into master, then push it
16+
run: |
17+
git pull
18+
git checkout master
19+
git merge development
20+
git push

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ Adds `upgrade-insecure-requests` support for requests from Firefox and Chrome (a
372372
373373
## 3.0.0
374374
375-
secure_headers 3.0.0 is a near-complete, not-entirely-backward-compatible rewrite. Please see the [upgrade guide](https://github.com/twitter/secureheaders/blob/master/docs/upgrading-to-3-0.md) for an in-depth explanation of the changes and the suggested upgrade path.
375+
secure_headers 3.0.0 is a near-complete, not-entirely-backward-compatible rewrite. Please see the [upgrade guide](https://github.com/twitter/secureheaders/blob/main/docs/upgrading-to-3-0.md) for an in-depth explanation of the changes and the suggested upgrade path.
376376
377377
## 2.5.1 - 2016-02-16 18:11:11 UTC - Remove noisy deprecation warning
378378

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Secure Headers ![Build + Test](https://github.com/github/secure_headers/workflows/Build%20+%20Test/badge.svg?branch=master) [![Code Climate](https://codeclimate.com/github/twitter/secureheaders.svg)](https://codeclimate.com/github/twitter/secureheaders) [![Coverage Status](https://coveralls.io/repos/twitter/secureheaders/badge.svg)](https://coveralls.io/r/twitter/secureheaders)
1+
# Secure Headers ![Build + Test](https://github.com/github/secure_headers/workflows/Build%20+%20Test/badge.svg?branch=main) [![Code Climate](https://codeclimate.com/github/twitter/secureheaders.svg)](https://codeclimate.com/github/twitter/secureheaders) [![Coverage Status](https://coveralls.io/repos/twitter/secureheaders/badge.svg)](https://coveralls.io/r/twitter/secureheaders)
22

3-
**master represents 6.x line**. See the [upgrading to 4.x doc](docs/upgrading-to-4-0.md), [upgrading to 5.x doc](docs/upgrading-to-5-0.md), or [upgrading to 6.x doc](docs/upgrading-to-6-0.md) for instructions on how to upgrade. Bug fixes should go in the 5.x branch for now.
3+
**main branch represents 6.x line**. See the [upgrading to 4.x doc](docs/upgrading-to-4-0.md), [upgrading to 5.x doc](docs/upgrading-to-5-0.md), or [upgrading to 6.x doc](docs/upgrading-to-6-0.md) for instructions on how to upgrade. Bug fixes should go in the 5.x branch for now.
44

55
The gem will automatically apply several headers that are related to security. This includes:
66
- Content Security Policy (CSP) - Helps detect/prevent XSS, mixed-content, and other classes of attack. [CSP 2 Specification](http://www.w3.org/TR/CSP2/)

0 commit comments

Comments
 (0)