Skip to content

Commit adb0633

Browse files
committed
Merge branch 'master' into rails-6.1
2 parents db6dba8 + 5b29f1b commit adb0633

File tree

836 files changed

+11035
-33374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

836 files changed

+11035
-33374
lines changed

.coveralls.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
# See: https://docs.docker.com/engine/reference/builder/#dockerignore-file
44
.git/
55
.github/
6-
.coveralls.yml
76
.dockerignore
87
.editorconfig
98
.gitignore
10-
.travis.yml
119
.rubocop.yml
1210
CHANGELOG.md
1311
docker-compose.yml

.github/CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,15 @@ We also keep ideas in there, and you are welcome to jump into the conversation.
2020
## Adding and updating features
2121

2222
Please [create a pull request][pr] to implement features you'd like to see.
23-
[Travis-ci][travis] is building every pull request,
23+
GitHub Actions builds every pull request,
2424
so we'll have prompt feedback on the progress of the feature implementation.
2525
We require a few things in order to merge a pull request:
2626

2727
- You must merge `master`'s latest commit
2828
- There must be no merge conflicts
2929
- Your new feature must be covered by tests
30-
- The Travis build must pass
30+
- The test build must pass
3131

32-
[travis]: https://travis-ci.org/indentlabs/notebook
3332
[pr]: https://github.com/indentlabs/notebook/compare/
3433
[create an issue report]: https://github.com/indentlabs/notebook/issues/new
3534
[issue tracker]: https://github.com/indentlabs/notebook/issues

.github/dependabot.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: bundler
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
labels:
9+
- Tech debt
10+
ignore:
11+
- dependency-name: aws-sdk-s3
12+
versions:
13+
- 1.88.0
14+
- 1.88.1
15+
- 1.88.2
16+
- 1.90.0
17+
- 1.92.0
18+
- 1.93.0
19+
- 1.93.1
20+
- dependency-name: stripe
21+
versions:
22+
- 5.30.0
23+
- 5.31.0
24+
- dependency-name: sidekiq
25+
versions:
26+
- 6.2.0
27+
- dependency-name: rspec-rails
28+
versions:
29+
- 4.1.0
30+
- dependency-name: pry
31+
versions:
32+
- 0.14.0
33+
- dependency-name: rails
34+
versions:
35+
- 6.1.1
36+
- 6.1.2
37+
- 6.1.2.1
38+
- 6.1.3
39+
- dependency-name: webmock
40+
versions:
41+
- 3.11.2
42+
- 3.11.3
43+
- 3.12.0
44+
- dependency-name: rubocop
45+
versions:
46+
- 1.10.0
47+
- 1.9.0
48+
- 1.9.1
49+
- dependency-name: puma
50+
versions:
51+
- 5.2.0
52+
- 5.2.1
53+
- dependency-name: database_cleaner
54+
versions:
55+
- 2.0.0
56+
- dependency-name: capybara
57+
versions:
58+
- 3.35.1
59+
- dependency-name: ibm_watson
60+
versions:
61+
- 2.0.0

.github/workflows/tests.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
2+
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
3+
4+
name: Tests
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
test:
14+
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Set up Ruby
20+
uses: ruby/setup-ruby@v1
21+
with:
22+
ruby-version: 2.7.4
23+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
24+
- name: Set up Node
25+
uses: actions/setup-node@v1
26+
with:
27+
node-version: 14.15.0
28+
- name: Compile JS
29+
run: RAILS_ENV=test bundle exec rake assets:precompile
30+
- name: Run tests
31+
run: RAILS_ENV=test bundle exec rails test

.rspec

Lines changed: 0 additions & 2 deletions
This file was deleted.

.rubocop.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.2
1+
2.7.4

.storybook/main.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

.storybook/manager-head.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)