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.

Sign up for GitHub

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

Jump to bottom

upstream merge #2

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open

upstream merge #2

wants to merge 65 commits into from

Conversation

mlue
Copy link
Collaborator

@mlue mlue commented May 23, 2024

workerB

montch and others added 30 commits July 5, 2022 19:08
@montch
update version + dependencies
f02a6b7
@montch
Merge pull request #55 from whiplashmerch/enhancement-dep-upgrades
d0a7363 
Whiplash App - update version + dependencies
@michaelcheny
update #multi_page_get to return http format, now responds to .success?
92b0953
@michaelcheny
update existing tests
fb96321
@michaelcheny
add a partial_results_request non success block that breaks out of th…
8db1825 
…e loop if error occurs
@michaelcheny
change test description
6172667
@michaelcheny
bump up gem version and add test to return array in body
8a54363
@michaelcheny
add puts to see what travis is seeing
1c8761a
@michaelcheny
change equal to eq()
4567bbd
@michaelcheny
add new test for status 200
c88b9a7
@michaelcheny
put a puts to see travis error
ef18f72
@michaelcheny
adding more puts to see travis
aa0bf7d
@michaelcheny
testing if this passes travis
6181215
@michaelcheny
testing this again if it passes travis
1d84673
@michaelcheny
adding more puts
f5374ed
@michaelcheny
moving puts
e9c39d5
@michaelcheny
moving puts again
bbf64e7
@michaelcheny
response at the end
19663c3
@michaelcheny
more puts
9811236
@michaelcheny
puts res to json
6b749e9
@michaelcheny
remove comma
747cce1
@michaelcheny
commenting out the failing tests since travis is losing the res.body …
5088d2d 
…somehow
@michaelcheny
uncomment the failing test
8ccac35
@michaelcheny
adding pp
0575ee7
@michaelcheny
using request_body instead of body
345ce21
@michaelcheny
putting the pp back in
98ae34f
@michaelcheny
going through the .env
e1556b5
@DaemonSpelledWrong
Merge pull request #56 from whiplashmerch/enhancement-multi_page_get-…
cd3b35e 
…refactor

Enhancement multi page get refactor to http response
@aboh07
Create ci.yml
4626842
@aboh07
Update ci.yml
c77634f
ideaoforder and others added 30 commits December 19, 2023 13:19
@ideaoforder
Merge pull request #61 from whiplashmerch/bugfix-url-error
d3da476 
Finally fixed the "NoMethodError `url` for @whiplash_api" bug
@ideaoforder
we're sending some bad characters at the front of an HTTP status head…
e486156 
…er; now strip them and log it
@ideaoforder
Merge pull request #62 from whiplashmerch/bugfix-catch-bad-http-statu…
2fe5c6f 
…s-header

Bad Header String
@ideaoforder
support for canonical host
43d6915
@ideaoforder
Merge pull request #63 from whiplashmerch/feature-canonical-url
6923797 
support for canonical host
@ideaoforder
tweaks for client creds
8ccfc6e
@ideaoforder
generalize current user and cookie methods for all child apps
219b373
@ideaoforder
tidying
d6deee6
@ideaoforder
tidying
b99fc2f
@ideaoforder
Update README.md
568a823
@ideaoforder
Merge pull request #64 from whiplashmerch/enhancement-client-creds-fl…
1c9cc7f 
…ow-updates

Enhancement client creds flow updates
@ideaoforder
arbitrary version update
292826c
@ideaoforder
methods to set customer and warehouse objects
8302bcd
@ideaoforder
support fo current_warehouse and current_customer cookies, setting an…
08a67a3 
…d unsetting
@ideaoforder
Merge pull request #65 from whiplashmerch/enhancement-set-warehouse-a…
6d02e22 
…nd-customer-cookies

Enhancement set warehouse and customer cookies
@ideaoforder
Support distinct core url for auth vs API requets
74488fd
@ideaoforder
application_url not app_url; make sure application_url is defined
8fc4754
@ideaoforder
send current url for login redirects
2f0e6c5
@ideaoforder
return out
640cd19
@ideaoforder
gem cache busting--version bump
e717a78
@ideaoforder
Rails API only mode breaks with helper_method
7df80cc
@ideaoforder
maybe commit the changes
3e93350
@ideaoforder
version bump
305bd7f
@ideaoforder
fix cookie domain
1863704
@ideaoforder
version
d921231
@ideaoforder
clear application cookies too--mainly for backward compatibility
bf74208
@ideaoforder
Merge pull request #66 from whiplashmerch/enhancement-distinct-core-url
b97c2c3 
Support distinct core url for auth vs API requets
@jarana-ryder
add slug
5a83358
@jarana-ryder
bump version
7ca8068
@jarana-ryder
Merge pull request #68 from whiplashmerch/enhancement-add-wh-slug
b953dc1 
Update warehouse fields to include slug
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@mlue @montch @michaelcheny @DaemonSpelledWrong @aboh07 @rselk @ideaoforder @jarana-ryder