236 simple api#241

Open

ghost wants to merge 34 commits intomainfrom

Commits on Oct 29, 2015

Commits on May 1, 2017

Create Adopted controller for API, and wrote initial auth/authorization code for API using basic auth

root
authored and
root
committed
Add API route, and setting to allow for basic_auth

root
authored and
root
committed
Forgot to add the helper file

root
authored and
root
committed

Commits on May 2, 2017

Edited authentication controller so that a session isn't created on the back-end, Added admin check, Render json for adopted drains

root
authored and
root
committed
Adopted Drains API controller test

root
authored and
root
committed
Trying to fix Travis CI errors

root
authored and
root
committed
Added formatting for different content types, and edited fields to be output

root
authored and
root
committed
(Finally realized I can run Rubocop on my local machine)

root
authored and
root
committed
More controller tests

root
authored and
root
committed

Commits on Jun 20, 2017

Add Faker gem in order to make sample users

root
authored and
root
committed
Adding some user seeds

root
authored and
root
committed

Commits on Jul 24, 2017

Added a rake task for DEV so mock users can automatically adopt drains. I created this initially to test out how the API would handle load

root
authored and
root
committed
Passing rubocop

root
authored and
root
committed

Commits on Jul 25, 2017

Changing !nil to nil... !nil evaluates to true

root
authored and
root
committed

Commits on Jul 26, 2017

Initial comments for cursor funcionality

root
authored and
root
committed

Commits on Aug 14, 2017

Adding Kaminari gem for pagination

James Fowler
authored and
James Fowler
committed
added pagination functionality to API

James Fowler
authored and
James Fowler
committed
Made is so that a CSV template is rendered with all results rather than paged results

James Fowler
authored and
James Fowler
committed
auto_adopt task comment for further clarification

James Fowler
authored and
James Fowler
committed

Commits on Dec 15, 2017

Updated dev-envt config file

James Fowler
authored and
James Fowler
committed
temporarily changed asset host

James Fowler
authored and
James Fowler
committed
Added a total_pages variable, changed default page to 1, and a adopted_drains var

James Fowler
authored and
James Fowler
committed

Commits on Dec 16, 2017

Updating versions

James Fowler
authored and
James Fowler
committed
Removed format options - JSON is the only format available now

James Fowler
authored and
James Fowler
committed
Updated gem versions

James Fowler
authored and
James Fowler
committed
Change local_time to local-time... (I saw it was already changed, but had to change it on my local env)

James Fowler
authored and
James Fowler
committed
Updated pagination defaults

James Fowler
authored and
James Fowler
committed
Uncommenting so I could add drains

James Fowler
authored and
James Fowler
committed
Making this clearer, and printing out info

James Fowler
authored and
James Fowler
committed
Response data tests for pagination counts and drain data

James Fowler
authored and
James Fowler
committed
Fixed a lot of merge conflicts from prod... And made changes to pass Rubocop

James Fowler
authored and
James Fowler
committed

Commits on Jan 6, 2018

Merge remote-tracking branch 'origin/master' into 236-simple-api
jszwedko
committed