Merge branch 'release-4.3' into staging
Merge branch 'release-4.4' into staging
Merge branch 'release-4.4' into staging
Merge branch 'release-4.4' into staging
organized Gemfile, put things in groups. Made generating the erd optional by passing a flag so it doens't slow down db:migrate and updated readme with how to run it as part of migration
added migration for api key on user
added generation of api key to user and a spec
added api key to user settings form, formated as monospace, added hint and label to en.yml file
hex is already a string removed needless conversion, readme updated with instructions to opt out of erd generation, rake task for erd generation updated
Merge branch '1129_user_has_api_key' into 1130_user_sees_api_settings_page
found the right place in the yml file to put the api_key hint
WIP ...meh
it works! yay! yaygit status
WIP, not responding with json as expected
Merge branch 'release-4.5' into staging
Merge branch 'develop' into release-4.5
Merge branch 'release-4.5' into staging
work on versioning and start of missions
merging user has api key
merging in user see api key on settings page