Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream changes #4

Open
wants to merge 92 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
304ff34
build(deps): bump lumberjack from 1.2.4 to 1.2.5
dependabot-preview[bot] May 29, 2020
443d474
Merge pull request #323 from MikeMcQuaid/dependabot/bundler/lumberjac…
dependabot-preview[bot] May 29, 2020
1c9ac72
build(deps): bump coderay from 1.1.2 to 1.1.3
dependabot-preview[bot] Jun 1, 2020
6cad321
script/cibuild: change installs.
MikeMcQuaid Jun 1, 2020
e32903f
Merge pull request #324 from MikeMcQuaid/dependabot/bundler/coderay-1…
MikeMcQuaid Jun 1, 2020
706573f
build(deps): bump ffi from 1.12.2 to 1.13.0
dependabot-preview[bot] Jun 2, 2020
ab38e3f
Merge pull request #325 from MikeMcQuaid/dependabot/bundler/ffi-1.13.0
dependabot-preview[bot] Jun 2, 2020
a51f5d5
build(deps): bump ffi from 1.13.0 to 1.13.1
dependabot-preview[bot] Jun 10, 2020
f39ccd2
Merge pull request #326 from MikeMcQuaid/dependabot/bundler/ffi-1.13.1
dependabot-preview[bot] Jun 10, 2020
6cff268
build(deps): [security] bump rack from 2.2.2 to 2.2.3
dependabot-preview[bot] Jun 15, 2020
81909b6
Merge pull request #328 from MikeMcQuaid/dependabot/bundler/rack-2.2.3
dependabot-preview[bot] Jun 15, 2020
6590302
README: fix Markdown linter warnings.
MikeMcQuaid Jun 16, 2020
06d9bb8
README: clarify script/* run conditions.
MikeMcQuaid Jun 16, 2020
3f9571f
Merge pull request #329 from MikeMcQuaid/fix-markdown-warnings
MikeMcQuaid Jun 16, 2020
a942c37
Merge pull request #330 from MikeMcQuaid/executable-scripts
MikeMcQuaid Jun 16, 2020
66a9d27
build(deps): bump lumberjack from 1.2.5 to 1.2.6
dependabot-preview[bot] Jun 22, 2020
4406b16
Merge pull request #331 from MikeMcQuaid/dependabot/bundler/lumberjac…
dependabot-preview[bot] Jun 22, 2020
f8a1bda
build(deps): bump multi_json from 1.14.1 to 1.15.0
dependabot-preview[bot] Jul 10, 2020
90afc3e
Merge pull request #332 from MikeMcQuaid/dependabot/bundler/multi_jso…
dependabot-preview[bot] Jul 10, 2020
0df0961
build(deps): bump unicorn from 5.5.5 to 5.6.0
dependabot-preview[bot] Jul 27, 2020
2e898b3
Merge pull request #333 from MikeMcQuaid/dependabot/bundler/unicorn-5…
dependabot-preview[bot] Jul 27, 2020
09abcb1
Add GPR support to GITHUB_TOKEN
tquinn86 Jul 28, 2020
4538408
Merge pull request #334 from tquinn86/tquinn86/gpr_support
MikeMcQuaid Jul 29, 2020
8fcee6f
This adds permissions for gh cli
Jul 29, 2020
28457d1
Merge pull request #335 from wenlock/wenlock-patch-1
MikeMcQuaid Jul 29, 2020
db404e9
build(deps): bump lumberjack from 1.2.6 to 1.2.7
dependabot-preview[bot] Jul 31, 2020
abe09b9
Merge pull request #336 from MikeMcQuaid/dependabot/bundler/lumberjac…
dependabot-preview[bot] Jul 31, 2020
0120079
build(deps-dev): bump foreman from 0.87.1 to 0.87.2
dependabot-preview[bot] Aug 10, 2020
9d00ea1
Merge pull request #337 from MikeMcQuaid/dependabot/bundler/foreman-0…
dependabot-preview[bot] Aug 10, 2020
39dc5ee
build(deps): bump omniauth-oauth2 from 1.6.0 to 1.7.0
dependabot-preview[bot] Aug 12, 2020
2dc34fe
Merge pull request #338 from MikeMcQuaid/dependabot/bundler/omniauth-…
dependabot-preview[bot] Aug 12, 2020
86a4115
build(deps): bump jwt from 2.2.1 to 2.2.2
dependabot-preview[bot] Aug 19, 2020
283f822
Merge pull request #339 from MikeMcQuaid/dependabot/bundler/jwt-2.2.2
dependabot-preview[bot] Aug 19, 2020
e169795
build(deps): bump lumberjack from 1.2.7 to 1.2.8
dependabot-preview[bot] Sep 1, 2020
e56d737
Merge pull request #340 from MikeMcQuaid/dependabot/bundler/lumberjac…
dependabot-preview[bot] Sep 1, 2020
0f09c90
build(deps): bump public_suffix from 4.0.5 to 4.0.6
dependabot-preview[bot] Sep 3, 2020
118bb03
Merge pull request #341 from MikeMcQuaid/dependabot/bundler/public_su…
dependabot-preview[bot] Sep 3, 2020
ab39d80
build(deps): bump sinatra from 2.0.8.1 to 2.1.0
dependabot-preview[bot] Sep 7, 2020
4edf61b
Merge pull request #342 from MikeMcQuaid/dependabot/bundler/sinatra-2…
dependabot-preview[bot] Sep 7, 2020
2094b94
build(deps): bump unicorn from 5.6.0 to 5.7.0
dependabot-preview[bot] Sep 9, 2020
b90b500
Merge pull request #343 from MikeMcQuaid/dependabot/bundler/unicorn-5…
dependabot-preview[bot] Sep 9, 2020
80a800a
build(deps): bump faraday from 1.0.1 to 1.1.0
dependabot-preview[bot] Oct 19, 2020
acdcbfa
Merge pull request #344 from MikeMcQuaid/dependabot/bundler/faraday-1…
dependabot-preview[bot] Oct 19, 2020
a5b90b3
tests: cleanup Homebrew.
MikeMcQuaid Oct 21, 2020
7073ba2
Merge pull request #346 from MikeMcQuaid/cleanup-homebrew
MikeMcQuaid Oct 21, 2020
44c13f9
build(deps): bump octokit from 4.18.0 to 4.19.0
dependabot-preview[bot] Oct 21, 2020
3b8c837
Merge pull request #345 from MikeMcQuaid/dependabot/bundler/octokit-4…
dependabot-preview[bot] Oct 21, 2020
36e5541
Ruby 2.7.2
MikeMcQuaid Nov 11, 2020
6daa2b5
Merge pull request #349 from MikeMcQuaid/gemfile-lock-no-ruby-bundler
MikeMcQuaid Nov 11, 2020
19e6e1c
build(deps): bump listen from 3.2.1 to 3.3.0
dependabot-preview[bot] Nov 11, 2020
8705a07
Merge pull request #348 from MikeMcQuaid/dependabot/bundler/listen-3.3.0
dependabot-preview[bot] Nov 11, 2020
abf1213
workflows/tests: test Big Sur.
MikeMcQuaid Nov 11, 2020
9b78955
script/cibuild: run brew config, doctor.
MikeMcQuaid Nov 11, 2020
2ec77fd
Refactor CI configuration.
MikeMcQuaid Nov 12, 2020
f6a40f5
workflows/tests: set HOMEBREW_GITHUB_ACTIONS_BIG_SUR_TESTING
MikeMcQuaid Nov 12, 2020
c88fa8e
Merge pull request #350 from MikeMcQuaid/big-sur
MikeMcQuaid Nov 12, 2020
fafc3e4
build(deps): bump listen from 3.3.0 to 3.3.1
dependabot-preview[bot] Nov 16, 2020
0942f37
Merge pull request #351 from MikeMcQuaid/dependabot/bundler/listen-3.3.1
dependabot-preview[bot] Nov 16, 2020
da42d5b
Use POST for OmniAuth.
MikeMcQuaid Nov 18, 2020
385b041
workflows/tests: remove Big Sur workaround.
MikeMcQuaid Nov 18, 2020
0d4d655
Merge pull request #352 from MikeMcQuaid/omniauth-post
MikeMcQuaid Nov 18, 2020
2426df5
Merge pull request #354 from MikeMcQuaid/big-sur-cleanup
MikeMcQuaid Nov 18, 2020
f532992
Add RuboCop
MikeMcQuaid Nov 18, 2020
09a4f84
Merge pull request #353 from MikeMcQuaid/rubocop
MikeMcQuaid Nov 18, 2020
6c271cc
Revert "Use POST for OmniAuth."
mistydemeo Nov 18, 2020
a7a6e57
Merge pull request #355 from mistydemeo/revert_omniauth_post
mistydemeo Nov 18, 2020
965826f
build(deps): bump parallel from 1.20.0 to 1.20.1
dependabot-preview[bot] Nov 23, 2020
0846a67
Merge pull request #356 from MikeMcQuaid/dependabot/bundler/parallel-…
dependabot-preview[bot] Nov 23, 2020
94aca0e
build(deps-dev): bump rubocop from 1.3.1 to 1.4.1
dependabot-preview[bot] Nov 24, 2020
837b984
Merge pull request #357 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Nov 24, 2020
64699b2
Add a simple Dockerfile
mistydemeo Nov 24, 2020
2a25c8e
build(deps): bump rubocop-ast from 1.1.1 to 1.2.0
dependabot-preview[bot] Nov 25, 2020
d5eb3d8
Merge pull request #359 from MikeMcQuaid/dependabot/bundler/rubocop-a…
dependabot-preview[bot] Nov 25, 2020
30872e0
cibuild: validate Ruby version in Dockerfile too
mistydemeo Nov 25, 2020
7426494
build(deps): bump regexp_parser from 1.8.2 to 2.0.0
dependabot-preview[bot] Nov 26, 2020
584481a
Merge pull request #360 from MikeMcQuaid/dependabot/bundler/regexp_pa…
dependabot-preview[bot] Nov 26, 2020
d5e7794
build(deps-dev): bump rubocop from 1.4.1 to 1.4.2
dependabot-preview[bot] Nov 26, 2020
fb92b74
Merge pull request #361 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Nov 26, 2020
eefa324
Merge pull request #358 from mistydemeo/add_dockerfile
MikeMcQuaid Nov 26, 2020
0c0a0da
build(deps): bump listen from 3.3.1 to 3.3.3
dependabot-preview[bot] Nov 30, 2020
09db6a6
Merge pull request #362 from MikeMcQuaid/dependabot/bundler/listen-3.3.3
dependabot-preview[bot] Nov 30, 2020
865aba0
build(deps): bump rubocop-ast from 1.2.0 to 1.3.0
dependabot-preview[bot] Dec 1, 2020
48a8a1a
Merge pull request #363 from MikeMcQuaid/dependabot/bundler/rubocop-a…
dependabot-preview[bot] Dec 1, 2020
1ccc55f
build(deps-dev): bump rubocop from 1.4.2 to 1.5.1
dependabot-preview[bot] Dec 3, 2020
ea2668a
Merge pull request #364 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Dec 3, 2020
e9f957a
build(deps-dev): bump rubocop from 1.5.1 to 1.5.2
dependabot-preview[bot] Dec 7, 2020
bec935a
Merge pull request #365 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Dec 7, 2020
cd61729
build(deps-dev): bump rubocop from 1.5.2 to 1.6.0
dependabot-preview[bot] Dec 10, 2020
67ce8b2
Merge pull request #366 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Dec 10, 2020
a7cabad
build(deps-dev): bump rubocop from 1.6.0 to 1.6.1
dependabot-preview[bot] Dec 11, 2020
405f30b
Merge pull request #367 from MikeMcQuaid/dependabot/bundler/rubocop-1…
dependabot-preview[bot] Dec 11, 2020
6561691
Merge remote-tracking branch 'upstream/master' into upstream-changes
jdugan1024 Dec 16, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ GEM
ffi
thor (1.0.1)
tilt (2.0.10)
unicorn (5.5.5)
unicorn (5.6.0)
kgio (~> 2.6)
raindrops (~> 0.7)