-
Notifications
You must be signed in to change notification settings - Fork 66
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
adding merge functionality for eps to regular appointments #19754
Open
lee-delarm6
wants to merge
48
commits into
master
Choose a base branch
from
96412_merge_eps_appointments
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,133
−0
Open
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
a7c7ab2
adding merge functionality for eps to regular appointments
lee-delarm6 7b9caa6
rubocop fixes
lee-delarm6 f9d0a36
revert controller, move logic to service
lee-delarm6 0577b6e
update test
lee-delarm6 6401a1f
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 a749327
moved controller logic to service
lee-delarm6 36cbafd
dropping and fixing a few items
lee-delarm6 170d535
removing unused function
lee-delarm6 8a362ce
update to master
lee-delarm6 c565abd
fixes
lee-delarm6 26804f8
more fixes
lee-delarm6 7631136
last fix
lee-delarm6 fbde9be
maybe last fix
lee-delarm6 3c9df3b
Updated fix?
lee-delarm6 5822040
Fixed linting issues
lee-delarm6 91d4dbc
Changing naming, removing empty line
lee-delarm6 a755e2d
Lint fixes again
lee-delarm6 0b84443
Remove line
lee-delarm6 e7b6f30
eps serializer
lee-delarm6 76b38cb
rubocop fix
lee-delarm6 10a0b0f
Unfixed test
lee-delarm6 37add43
Fix tests and code
lee-delarm6 699e013
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 fabfda6
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 7445cac
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 beeb062
Fix data issues with appointments
lee-delarm6 a785508
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 22bd92c
Rubocop fixes
lee-delarm6 0c3691e
Add start time stamp for uniqueness
lee-delarm6 1e6bf3e
VCR update, spec updates, block updates
lee-delarm6 2a333fd
Rubocop fixes
lee-delarm6 80347b3
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 eb8d591
Updated line too long offenses
lee-delarm6 0694ff9
Merge branch '96412_merge_eps_appointments' of https://github.com/dep…
lee-delarm6 b8f3ebc
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 3fadd7d
Not needed anymore
lee-delarm6 deea80d
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 77cd91c
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 e3fc186
Moved status to serialize step
lee-delarm6 246ed56
Update modules/vaos/app/serializers/vaos/v2/eps_appointment.rb
lee-delarm6 5f05d5b
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 6fea526
rubocop fix
lee-delarm6 0b4093c
Merge branch '96412_merge_eps_appointments' of https://github.com/dep…
lee-delarm6 5e9be5f
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 303da0c
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 f817cac
Fixed testing and rubocop errors
lee-delarm6 6348a6b
Moving file locations
lee-delarm6 5581d55
Merge branch 'master' into 96412_merge_eps_appointments
lee-delarm6 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Moved status to serialize step
Moved status to serialize step, altered status method slightly
- Loading branch information
commit e3fc1867599d2730fb31342e18439dfad468a41b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggest removing the comma from here