Skip to content

Commit bafe2f3

Browse files
Merge branch 'master' into patch-1
2 parents 64fbc86 + c2796cd commit bafe2f3

File tree

287 files changed

+27646
-61430
lines changed

Some content is hidden

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

287 files changed

+27646
-61430
lines changed

.eslintrc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ rules:
88
object-curly-spacing: 0 # [loosen] override rackt
99
no-console: 0 # [loosen] override rackt
1010
no-unused-vars: [2, {vars: all, args: none}]
11+
12+
env:
13+
jest: true

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ android/build
4949
.idea
5050

5151
Pods
52+
53+
# for now. not such a great idea. need to sort the bundler 1.x/2.x issue here.
54+
Gemfile.lock

.rubocop.yml

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

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ cache: yarn
1010

1111
install:
1212
# Set up RVM, RubyGems, Bundler
13-
# - rvm install 2.6.3
14-
# Use 2.4.3, the most recent preinstalled on Travis
15-
# (also no longer receiving bug fixes, only security updates).
16-
- rvm use 2.4.3 --default
13+
- rvm use 2.6 --default
1714
- gem update --system
1815
- gem install bundler
1916
- bundle check || bundle install

0 commit comments

Comments
 (0)