Closed dazza-codes closed 9 years ago
To resolve conflict with master, used git fetch origin; git rebase master
to replay auth_enabled
commits on top of master (as described in http://stackoverflow.com/questions/7929369/how-to-rebase-local-branch-with-remote-master). This fixed some git rebase -i
work on the branch, which squashed some commits that were in master.
tagging @ndushay and @cbeer for review. When merged with master, we plan to cut a new gem release and deploy to triannon dev.
:TODO: Update README docs with authentication/authorization documentation
@cbeer - coveralls indicates it has no data, it could be an occasional failure or a change in our configs, esp see the spec/spec_helper.rb
where it has been modified to generate local data (available on dev-laptop) and it should also apply the coveralls formatter (see the 'SimpleCov Customization' section at https://coveralls.zendesk.com/hc/en-us/articles/201769485-Ruby-Rails).
I think you need this line in spec_helper:
Coveralls.wear!
This branch enabled authentication and authorization based on trusted clients and access keys. This is ready to go, although a couple of integration tests are pending for annotation creation and deletion.